Merge branch 'master' of ssh://git.phpeclipse.com/phpeclipse

[phpeclipse.git] / net.sourceforge.phpeclipse.phphelp / src / net / sourceforge / phpdt / httpquery / preferences / ConfigurationContentProvider.java

diff --git a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/httpquery/preferences/ConfigurationContentProvider.java b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/httpquery/preferences/ConfigurationContentProvider.java
index 0fd236f..87d989b 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/httpquery/preferences/ConfigurationContentProvider.java
+++ b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/httpquery/preferences/ConfigurationContentProvider.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
-  *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
@@ -32,19 +32,19 @@ public class ConfigurationContentProvider implements IStructuredContentProvider
        }
 
        /**
-        * Disposes of this content provider. This is called by the viewer when it is
-        * disposed.
+        * Disposes of this content provider. This is called by the viewer when it
+        * is disposed.
         */
        public void dispose() {
        }
 
        /**
-        * Returns the elements to display in the viewer when its input is set to the
-        * given element. These elements can be presented as rows in a table, items in
-        * a list, etc. The result is not modified by the viewer.
-        *
+        * Returns the elements to display in the viewer when its input is set to
+        * the given element. These elements can be presented as rows in a table,
+        * items in a list, etc. The result is not modified by the viewer.
+        * 
         * @param inputElement
-        *          the input element
+        *            the input element
         * @return the array of elements to display in the viewer
         */
        public Object[] getElements(Object inputElement) {
@@ -66,15 +66,15 @@ public class ConfigurationContentProvider implements IStructuredContentProvider
         * deregistering the viewer from the old input. In response to these change
         * notifications, the content provider propagates the changes to the viewer.
         * </p>
-        *
+        * 
         * @param viewer
-        *          the viewer
+        *            the viewer
         * @param oldInput
-        *          the old input element, or <code>null</code> if the viewer did
-        *          not previously have an input
+        *            the old input element, or <code>null</code> if the viewer
+        *            did not previously have an input
         * @param newInput
-        *          the new input element, or <code>null</code> if the viewer does
-        *          not have an input
+        *            the new input element, or <code>null</code> if the viewer
+        *            does not have an input
         */
        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
        }