From 8dab7866bab6e072789d537fa9f81ab18e2bb433 Mon Sep 17 00:00:00 2001
From: Andre Weinand
Date: Mon, 30 Aug 2004 10:40:21 +0000
Subject: added standard ZRH compiler options

---
 .../org/eclipse/compare/BufferedContent.java       |  1 +
 .../org/eclipse/compare/CompareEditorInput.java    |  1 +
 .../compare/org/eclipse/compare/CompareUI.java     |  1 +
 .../org/eclipse/compare/CompareViewerPane.java     |  2 +-
 .../compare/CompareViewerSwitchingPane.java        |  4 ++--
 .../eclipse/compare/EditionSelectionDialog.java    | 22 ++++++++++------------
 .../compare/org/eclipse/compare/Splitter.java      |  2 +-
 .../eclipse/compare/ZipFileStructureCreator.java   |  2 +-
 .../contentmergeviewer/ContentMergeViewer.java     | 12 ++++++++----
 9 files changed, 26 insertions(+), 21 deletions(-)

(limited to 'bundles/org.eclipse.compare/compare')

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java
index 2c1f7b769..5e352752a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java
@@ -38,6 +38,7 @@ public abstract class BufferedContent implements IContentChangeNotifier, IStream
 	 * Creates a buffered stream content accessor.
 	 */
 	protected BufferedContent() {
+		// empty implementation
 	}
 		
 	/* (non-Javadoc)
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index 0e7d6ee04..08c569903 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -429,6 +429,7 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 	
 	/**
 	 * @param parent the parent control under which the control must be created
+	 * @param direction the layout direction of the contents, either </code>SWT.HORIZONTAL<code> or </code>SWT.VERTICAL<code> 
 	 * @return the SWT control hierarchy for the outline part of the compare editor
 	 * @since 3.0
 	 */
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
index a158143e9..222de63ac 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
@@ -88,6 +88,7 @@ public final class CompareUI {
 	public static final String COMPARE_VIEWER_TITLE= "org.eclipse.compare.CompareUI.CompareViewerTitle"; //$NON-NLS-1$
 	
 	private CompareUI() {
+		// empty implementation
 	}
 	
 	public static AbstractUIPlugin getPlugin() {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java
index d8213f047..5246ae1c4 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java
@@ -45,7 +45,7 @@ public class CompareViewerPane extends ViewForm {
 	 * @exception IllegalArgumentException <ul>
 	 *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
 	 * </ul>
-	 * @exception SWTException <ul>
+	 * @exception org.eclipse.swt.SWTException <ul>
 	 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
 	 * </ul>
 	 */		
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
index ad767600c..1b5c92d8f 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
@@ -66,7 +66,7 @@ public abstract class CompareViewerSwitchingPane extends CompareViewerPane
 	 * @exception IllegalArgumentException <ul>
 	 *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
 	 * </ul>
-	 * @exception SWTException <ul>
+	 * @exception org.eclipse.swt.SWTException <ul>
 	 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
 	 * </ul>
 	 */		
@@ -85,7 +85,7 @@ public abstract class CompareViewerSwitchingPane extends CompareViewerPane
 	 * @exception IllegalArgumentException <ul>
 	 *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
 	 * </ul>
-	 * @exception SWTException <ul>
+	 * @exception org.eclipse.swt.SWTException <ul>
 	 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
 	 * </ul>
 	 */		
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
index 70be55a02..b2154ad92 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -108,7 +108,7 @@ public class EditionSelectionDialog extends ResizableDialog {
 			return fItem;
 		}
 		
-		/**
+		/*
 		 * The content is lazily loaded
 		 */
 		private String getContent() {
@@ -131,9 +131,6 @@ public class EditionSelectionDialog extends ResizableDialog {
 			return fContent;
 		}
 		
-		/**
-		 * Compares content of item.
-		 */
 		public boolean equals(Object other) {
 			if (other != null && other.getClass() == getClass()) {
 				if (getContent().equals(((Pair)other).getContent()))
@@ -626,6 +623,7 @@ public class EditionSelectionDialog extends ResizableDialog {
 	 *
 	 * @param edition the edition for which a label must be returned
  	 * @param item if a path has been specified in <code>edition</code> a sub element of the given edition; otherwise the same as edition
+ 	 * @param date this date will be returned as part of the formatted string
  	 * @return a label of a node in the edition tree viewer
 	 * @since 2.0
 	 */
@@ -825,15 +823,15 @@ public class EditionSelectionDialog extends ResizableDialog {
 	 * @since 2.0
 	 */
 	protected void okPressed() {
-		if (fCompareMode)
-			;	// don't dismiss dialog
-		else
+		if (fCompareMode) {
+			// don't dismiss dialog
+		} else
 			super.okPressed();
 	}
 
 	//---- private stuff ----------------------------------------------------------------------------------------
 				
-	/**
+	/*
 	 * Asynchroneously sends a Pair (or null) to the UI thread.
 	 */
 	private void sendPair(final Pair pair) {		
@@ -878,7 +876,7 @@ public class EditionSelectionDialog extends ResizableDialog {
 			internalSort(keys, left, original_right); 
 	}
 	
-	/**
+	/*
 	 * Adds the given Pair to the member editions.
 	 * If HIDE_IDENTICAL is true the new Pair is only added if its contents
 	 * is different from the preceeding Pair.
@@ -952,7 +950,7 @@ public class EditionSelectionDialog extends ResizableDialog {
 			addEdition(pair);
 	}
 		
-	/**
+	/*
 	 * Returns the number of s since Jan 1st, 1970.
 	 * The given date is converted to GMT and daylight saving is taken into account too.
 	 */
@@ -965,7 +963,7 @@ public class EditionSelectionDialog extends ResizableDialog {
 		return (date + localTimeOffset) / ONE_DAY_MS;
 	}
 	
-	/**
+	/*
 	 * Adds the given Pair to the edition tree.
 	 * It takes care of creating tree nodes for different dates.
 	 */
@@ -1046,7 +1044,7 @@ public class EditionSelectionDialog extends ResizableDialog {
 			lastDay.setExpanded(true);
 	}
 						
-	/**
+	/*
 	 * Feeds selection from member viewer to edition viewer.
 	 */
 	private void handleMemberSelect(Widget w) {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java
index d6c60c7ff..4fb46d6b1 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java
@@ -48,7 +48,7 @@ public class Splitter extends SashForm {
 	 * @exception IllegalArgumentException <ul>
 	 *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
 	 * </ul>
-	 * @exception SWTException <ul>
+	 * @exception org.eclipse.swt.SWTException <ul>
 	 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
 	 * </ul>
 	 */
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
index cccd4601f..935814485 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
@@ -54,7 +54,7 @@ public class ZipFileStructureCreator implements IStructureCreator {
 			return CompareUI.getImage(getType());
 		}
 
-		/**
+		/*
 		 * Returns true if other is ITypedElement and names are equal.
 		 * @see IComparator#equals
 		 */
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index 48b1591d0..ded703e43 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -282,7 +282,8 @@ public abstract class ContentMergeViewer extends ContentViewer
 	/**
 	 * Creates a new content merge viewer and initializes with a resource bundle and a
 	 * configuration.
-	 *
+	 * 
+	 * @param style SWT style bits
 	 * @param bundle the resource bundle
 	 * @param cc the configuration object
 	 */
@@ -376,6 +377,7 @@ public abstract class ContentMergeViewer extends ContentViewer
 	 * @param toolBarManager the toolbar manager to contribute to
 	 */
 	protected void createToolItems(ToolBarManager toolBarManager) {
+		// empty implementation
 	}
 
 	/**
@@ -431,6 +433,7 @@ public abstract class ContentMergeViewer extends ContentViewer
 	 * The <code>ContentMergeViewer</code> implementation of this 
 	 * <code>ContentViewer</code> method
 	 * checks to ensure that the content provider is an <code>IMergeViewerContentProvider</code>.
+	 * @param contentProvider the contentprovider to set. Must implement IMergeViewerContentProvider. 
 	 */
 	public void setContentProvider(IContentProvider contentProvider) {
 		Assert.isTrue(contentProvider instanceof IMergeViewerContentProvider);
@@ -458,6 +461,7 @@ public abstract class ContentMergeViewer extends ContentViewer
 	 * <code>Viewer</code> method does nothing. Subclasses may reimplement.
 	 */
 	public void setSelection(ISelection s, boolean reveal) {
+		// empty implementation
 	}
 
 	/* package */ void propertyChange(PropertyChangeEvent event) {
@@ -921,7 +925,7 @@ public abstract class ContentMergeViewer extends ContentViewer
 //		return null;
 //	}
 		
-	/**
+	/*
 	 * Calculates the height of the header.
 	 */
 	/* package */ int getHeaderHeight() {
@@ -932,7 +936,7 @@ public abstract class ContentMergeViewer extends ContentViewer
 
 	//---- merge direction
 	
-	/**
+	/*
 	 * Returns true if both sides are editable.
 	 */
 	/* package */ boolean canToggleMergeDirection() {
@@ -1008,7 +1012,7 @@ public abstract class ContentMergeViewer extends ContentViewer
 		saveContent(getInput());
 	}
 	
-	/**
+	/*
 	 * Save modified content back to input elements via the content provider.
 	 */
 	/* package */ void saveContent(Object oldInput) {
-- 
cgit v1.2.3