directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r576950 - in /directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor: ./ controller/actions/ view/editors/attributetype/ view/editors/objectclass/ view/editors/schema/ view/preferences/ view/search...
Date Tue, 18 Sep 2007 15:33:25 GMT
Author: pamarcelot
Date: Tue Sep 18 08:33:19 2007
New Revision: 576950

URL: http://svn.apache.org/viewvc?rev=576950&view=rev
Log:
Applied code formatting.

Modified:
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/NewProjectAction.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/PluginPreferencePage.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesInformationWizardPage.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
Tue Sep 18 08:33:19 2007
@@ -246,7 +246,8 @@
     public static final String PREFS_SEARCH_PAGE_SEARCH_IN_ALIASES = Activator.PLUGIN_ID
         + ".preferences.SearchPage.scopeAliases"; //$NON-NLS-1$
     /** The preference ID for Search In 'OID' of the SearchPage */
-    public static final String PREFS_SEARCH_PAGE_SEARCH_IN_OID = Activator.PLUGIN_ID + ".preferences.SearchPage.scopeOid";
//$NON-NLS-1$
+    public static final String PREFS_SEARCH_PAGE_SEARCH_IN_OID = Activator.PLUGIN_ID
+        + ".preferences.SearchPage.scopeOid"; //$NON-NLS-1$
     /** The preference ID for Search In 'Description' of the SearchPage */
     public static final String PREFS_SEARCH_PAGE_SEARCH_IN_DESCRIPTION = Activator.PLUGIN_ID
         + ".preferences.SearchPage.scopeDescription"; //$NON-NLS-1$
@@ -269,8 +270,7 @@
     public static final String PREFS_SEARCH_PAGE_SEARCH_IN_OPTIONAL_ATTRIBUTES = Activator.PLUGIN_ID
         + ".preferences.SearchPage.scopeOptionalAttributes"; //$NON-NLS-1$
     /** The preference ID for Scope of the SearchPage */
-    public static final String PREFS_SEARCH_PAGE_SCOPE = Activator.PLUGIN_ID
-    + ".preferences.SearchPage.scope"; //$NON-NLS-1$
+    public static final String PREFS_SEARCH_PAGE_SCOPE = Activator.PLUGIN_ID + ".preferences.SearchPage.scope";
//$NON-NLS-1$
     /** The preference value for Scope Attribute Types And Object Classes of the SearchPage
*/
     public static final int PREFS_SEARCH_PAGE_SCOPE_AT_AND_OC = 0;
     /** The preference value for Scope Attribute Types only of the SearchPage */

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/NewProjectAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/NewProjectAction.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/NewProjectAction.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/NewProjectAction.java
Tue Sep 18 08:33:19 2007
@@ -50,7 +50,7 @@
         super( "New Schema P&roject" );
         setToolTipText( "New Schema Project" );
         setId( PluginConstants.CMD_NEW_PROJECT );
-        setActionDefinitionId( PluginConstants.CMD_NEW_PROJECT  );
+        setActionDefinitionId( PluginConstants.CMD_NEW_PROJECT );
         setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
             PluginConstants.IMG_PROJECT_NEW ) );
         setEnabled( true );

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
Tue Sep 18 08:33:19 2007
@@ -131,7 +131,7 @@
     public void init( IEditorSite site, IEditorInput input ) throws PartInitException
     {
         super.init( site, input );
-        
+
         instance = this;
 
         setSite( site );

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
Tue Sep 18 08:33:19 2007
@@ -669,10 +669,9 @@
 
         // Listeners initialization
         addListeners();
-        
+
         // Help Context for Dynamic Help
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( form,
-            Activator.PLUGIN_ID + "." + "attribute_type_editor" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( form, Activator.PLUGIN_ID + "."
+ "attribute_type_editor" );
     }
 
 

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
Tue Sep 18 08:33:19 2007
@@ -243,10 +243,9 @@
 
         // Listeners initialization
         addListeners();
-        
+
         // Help Context for Dynamic Help
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( form,
-            Activator.PLUGIN_ID + "." + "attribute_type_editor" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( form, Activator.PLUGIN_ID + "."
+ "attribute_type_editor" );
     }
 
 

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
Tue Sep 18 08:33:19 2007
@@ -130,7 +130,7 @@
     public void init( IEditorSite site, IEditorInput input ) throws PartInitException
     {
         super.init( site, input );
-        
+
         instance = this;
 
         setSite( site );

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
Tue Sep 18 08:33:19 2007
@@ -854,7 +854,7 @@
 
         // Listeners initialization
         addListeners();
-        
+
         // Help Context for Dynamic Help
         PlatformUI.getWorkbench().getHelpSystem().setHelp( form, Activator.PLUGIN_ID + "."
+ "object_class_editor" );
     }

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java
Tue Sep 18 08:33:19 2007
@@ -78,7 +78,7 @@
     public void init( IEditorSite site, IEditorInput input ) throws PartInitException
     {
         super.init( site, input );
-        
+
         instance = this;
 
         setSite( site );

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/PluginPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/PluginPreferencePage.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/PluginPreferencePage.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/PluginPreferencePage.java
Tue Sep 18 08:33:19 2007
@@ -111,7 +111,7 @@
                     PluginConstants.IMG_SCHEMA_CONNECTOR ).createImage();
             }
         } );
-        
+
         schemaConnectorsTableViewer.setComparator( new ViewerComparator( new Comparator<String>()
         {
             public int compare( String o1, String o2 )
@@ -125,23 +125,23 @@
                 return 0;
             }
         } ) );
-       
-//      schemaConnectorsTableViewer.setComparator( new ViewerComparator( new Comparator<SchemaConnector>()
-//      {
-//          public int compare( SchemaConnector o1, SchemaConnector o2 )
-//          {
-//              String name1 = o1.getName();
-//              String name2 = o2.getName();
-//
-//              if ( ( name1 != null ) && ( name2 != null ) )
-//              {
-//                  return name1.compareToIgnoreCase( name2 );
-//              }
-//
-//              // Default
-//              return 0;
-//          }
-//      } ) );
+
+        //      schemaConnectorsTableViewer.setComparator( new ViewerComparator( new Comparator<SchemaConnector>()
+        //      {
+        //          public int compare( SchemaConnector o1, SchemaConnector o2 )
+        //          {
+        //              String name1 = o1.getName();
+        //              String name2 = o2.getName();
+        //
+        //              if ( ( name1 != null ) && ( name2 != null ) )
+        //              {
+        //                  return name1.compareToIgnoreCase( name2 );
+        //              }
+        //
+        //              // Default
+        //              return 0;
+        //          }
+        //      } ) );
         schemaConnectorsTableViewer.setInput( PluginUtils.getSchemaConnectors() );
 
         // Description Text

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java
Tue Sep 18 08:33:19 2007
@@ -244,12 +244,13 @@
         }
         else
         {
-            descriptionButon.setSelection( settings.getBoolean( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_DESCRIPTION
) );
+            descriptionButon.setSelection( settings
+                .getBoolean( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_DESCRIPTION ) );
         }
         superiorButton.setSelection( settings.getBoolean( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_SUPERIOR
) );
         syntaxButton.setSelection( settings.getBoolean( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_SYNTAX
) );
-        matchingRulesButton
-            .setSelection( settings.getBoolean( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_MATCHING_RULES
) );
+        matchingRulesButton.setSelection( settings
+            .getBoolean( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_MATCHING_RULES ) );
         superiorsButton.setSelection( settings.getBoolean( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_SUPERIORS
) );
         mandatoryAttributesButton.setSelection( settings
             .getBoolean( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_MANDATORY_ATTRIBUTES
) );
@@ -550,7 +551,7 @@
         return searchScope;
     }
 
-    
+
     /**
      * Loads the scope.
      *
@@ -562,6 +563,7 @@
         return Activator.getDefault().getDialogSettings().getInt( PluginConstants.PREFS_SEARCH_PAGE_SCOPE
);
     }
 
+
     /**
      * Saves the Search scope.
      *
@@ -578,11 +580,13 @@
             settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_OID, scope.contains(
SearchInEnum.OID ) );
             settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_DESCRIPTION, scope
                 .contains( SearchInEnum.DESCRIPTION ) );
-            settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_SUPERIOR, scope.contains(
SearchInEnum.SUPERIOR ) );
+            settings
+                .put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_SUPERIOR, scope.contains(
SearchInEnum.SUPERIOR ) );
             settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_SYNTAX, scope.contains(
SearchInEnum.SYNTAX ) );
             settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_MATCHING_RULES, scope
                 .contains( SearchInEnum.MATCHING_RULES ) );
-            settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_SUPERIORS, scope.contains(
SearchInEnum.SUPERIORS ) );
+            settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_SUPERIORS, scope
+                .contains( SearchInEnum.SUPERIORS ) );
             settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_MANDATORY_ATTRIBUTES,
scope
                 .contains( SearchInEnum.MANDATORY_ATTRIBUTES ) );
             settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_OPTIONAL_ATTRIBUTES,
scope

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
Tue Sep 18 08:33:19 2007
@@ -86,10 +86,9 @@
         initViewer( parent );
 
         controller = new HierarchyViewController( this );
-        
+
         // Help Context for Dynamic Help
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent,
-            Activator.PLUGIN_ID + "." + "hierarchy_view" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, Activator.PLUGIN_ID +
"." + "hierarchy_view" );
     }
 
 

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java
Tue Sep 18 08:33:19 2007
@@ -60,7 +60,7 @@
 
     /** The SchemaChecker */
     private SchemaChecker schemaChecker;
-    
+
     /** The Controller */
     private ProblemsViewController controller;
 
@@ -71,9 +71,8 @@
     public void createPartControl( Composite parent )
     {
         // Help Context for Dynamic Help
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent,
-            Activator.PLUGIN_ID + "." + "problems_view" );
-        
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, Activator.PLUGIN_ID +
"." + "problems_view" );
+
         GridLayout gridLayout = new GridLayout();
         gridLayout.horizontalSpacing = 0;
         gridLayout.marginBottom = 0;
@@ -203,7 +202,8 @@
 
         overviewLabel.setText( sb.toString() );
     }
-    
+
+
     /* (non-Javadoc)
      * @see org.eclipse.ui.part.WorkbenchPart#dispose()
      */

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java
Tue Sep 18 08:33:19 2007
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.studio.schemaeditor.view.views;
 
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,120 +37,143 @@
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
+
 /**
  * This class implements the ContentProvider for the ProblemsView.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ProblemsViewContentProvider implements IStructuredContentProvider,
-		ITreeContentProvider {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-		// Nothing to do.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-	 *      java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		// Nothing to do.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		List<TreeNode> children = null;
-
-		if (parentElement instanceof ProblemsViewRoot) {
-			ProblemsViewRoot root = (ProblemsViewRoot) parentElement;
-
-			if (root.getChildren().isEmpty()) {
-				SchemaChecker schemaChecker = Activator.getDefault()
-						.getSchemaChecker();
-
-				if (schemaChecker != null) {
-					List<SchemaError> errors = schemaChecker.getErrors();
-					if (!errors.isEmpty()) {
-						Folder errorsFolder = new Folder(FolderType.ERROR, root);
-						root.addChild(errorsFolder);
-						for (SchemaError error : errors) {
-							errorsFolder.addChild(new SchemaErrorWrapper(error,
-									errorsFolder));
-						}
-					}
-
-					List<SchemaWarning> warnings = schemaChecker.getWarnings();
-					if (!warnings.isEmpty()) {
-						Folder warningsFolder = new Folder(FolderType.WARNING,
-								root);
-						root.addChild(warningsFolder);
-						for (SchemaWarning warning : warnings) {
-							warningsFolder.addChild(new SchemaWarningWrapper(
-									warning, warningsFolder));
-						}
-					}
-				}
-			}
-
-			children = root.getChildren();
-		} else if (parentElement instanceof Folder) {
-			Folder folder = (Folder) parentElement;
-
-			children = folder.getChildren();
-		} else if (parentElement instanceof SchemaErrorWrapper) {
-			children = new ArrayList<TreeNode>();
-		} else if (parentElement instanceof SchemaWarningWrapper) {
-			children = new ArrayList<TreeNode>();
-		}
-
-		return children.toArray();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof TreeNode) {
-			return ((TreeNode) element).getParent();
-		}
-
-		// Default
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof TreeNode) {
-			return ((TreeNode) element).hasChildren();
-		}
-
-		// Default
-		return false;
-	}
+public class ProblemsViewContentProvider implements IStructuredContentProvider, ITreeContentProvider
+{
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+     */
+    public Object[] getElements( Object inputElement )
+    {
+        return getChildren( inputElement );
+    }
+
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+     */
+    public void dispose()
+    {
+        // Nothing to do.
+    }
+
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
+     *      java.lang.Object, java.lang.Object)
+     */
+    public void inputChanged( Viewer viewer, Object oldInput, Object newInput )
+    {
+        // Nothing to do.
+    }
+
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+     */
+    public Object[] getChildren( Object parentElement )
+    {
+        List<TreeNode> children = null;
+
+        if ( parentElement instanceof ProblemsViewRoot )
+        {
+            ProblemsViewRoot root = ( ProblemsViewRoot ) parentElement;
+
+            if ( root.getChildren().isEmpty() )
+            {
+                SchemaChecker schemaChecker = Activator.getDefault().getSchemaChecker();
+
+                if ( schemaChecker != null )
+                {
+                    List<SchemaError> errors = schemaChecker.getErrors();
+                    if ( !errors.isEmpty() )
+                    {
+                        Folder errorsFolder = new Folder( FolderType.ERROR, root );
+                        root.addChild( errorsFolder );
+                        for ( SchemaError error : errors )
+                        {
+                            errorsFolder.addChild( new SchemaErrorWrapper( error, errorsFolder
) );
+                        }
+                    }
+
+                    List<SchemaWarning> warnings = schemaChecker.getWarnings();
+                    if ( !warnings.isEmpty() )
+                    {
+                        Folder warningsFolder = new Folder( FolderType.WARNING, root );
+                        root.addChild( warningsFolder );
+                        for ( SchemaWarning warning : warnings )
+                        {
+                            warningsFolder.addChild( new SchemaWarningWrapper( warning, warningsFolder
) );
+                        }
+                    }
+                }
+            }
+
+            children = root.getChildren();
+        }
+        else if ( parentElement instanceof Folder )
+        {
+            Folder folder = ( Folder ) parentElement;
+
+            children = folder.getChildren();
+        }
+        else if ( parentElement instanceof SchemaErrorWrapper )
+        {
+            children = new ArrayList<TreeNode>();
+        }
+        else if ( parentElement instanceof SchemaWarningWrapper )
+        {
+            children = new ArrayList<TreeNode>();
+        }
+
+        return children.toArray();
+    }
+
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+     */
+    public Object getParent( Object element )
+    {
+        if ( element instanceof TreeNode )
+        {
+            return ( ( TreeNode ) element ).getParent();
+        }
+
+        // Default
+        return null;
+    }
+
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+     */
+    public boolean hasChildren( Object element )
+    {
+        if ( element instanceof TreeNode )
+        {
+            return ( ( TreeNode ) element ).hasChildren();
+        }
+
+        // Default
+        return false;
+    }
 }

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java
Tue Sep 18 08:33:19 2007
@@ -52,9 +52,8 @@
     public void createPartControl( Composite parent )
     {
         // Help Context for Dynamic Help
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent,
-            Activator.PLUGIN_ID + "." + "projects_view" );
-        
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, Activator.PLUGIN_ID +
"." + "projects_view" );
+
         initViewer( parent );
 
         // Adding the controller

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java
Tue Sep 18 08:33:19 2007
@@ -62,8 +62,7 @@
         new SchemaViewController( this );
 
         // Help Context for Dynamic Help
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent,
-            Activator.PLUGIN_ID + "." + "schema_view" );
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, Activator.PLUGIN_ID +
"." + "schema_view" );
     }
 
 

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
Tue Sep 18 08:33:19 2007
@@ -110,9 +110,8 @@
     public void createPartControl( Composite parent )
     {
         // Help Context for Dynamic Help
-        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent,
-            Activator.PLUGIN_ID + "." + "search_view" );
-        
+        PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, Activator.PLUGIN_ID +
"." + "search_view" );
+
         this.parent = parent;
         GridLayout gridLayout = new GridLayout();
         gridLayout.horizontalSpacing = 0;
@@ -314,7 +313,8 @@
         {
             public void widgetSelected( SelectionEvent e )
             {
-                settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_DESCRIPTION, descriptionMenuItem.getSelection()
);
+                settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_DESCRIPTION, descriptionMenuItem
+                    .getSelection() );
             }
         } );
         // Separator
@@ -369,8 +369,8 @@
         {
             public void widgetSelected( SelectionEvent e )
             {
-                settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_MANDATORY_ATTRIBUTES,
mandatoryAttributesMenuItem
-                    .getSelection() );
+                settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_MANDATORY_ATTRIBUTES,
+                    mandatoryAttributesMenuItem.getSelection() );
             }
         } );
         // Optional Attributes
@@ -380,8 +380,8 @@
         {
             public void widgetSelected( SelectionEvent e )
             {
-                settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_OPTIONAL_ATTRIBUTES,
optionalAttributesMenuItem
-                    .getSelection() );
+                settings.put( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_OPTIONAL_ATTRIBUTES,
+                    optionalAttributesMenuItem.getSelection() );
             }
         } );
 
@@ -410,8 +410,8 @@
         }
         else
         {
-            descriptionMenuItem
-                .setSelection( settings.getBoolean( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_DESCRIPTION
) );
+            descriptionMenuItem.setSelection( settings
+                .getBoolean( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_DESCRIPTION ) );
         }
 
         superiorMenuItem.setSelection( settings.getBoolean( PluginConstants.PREFS_SEARCH_PAGE_SEARCH_IN_SUPERIOR
) );

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesInformationWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesInformationWizardPage.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesInformationWizardPage.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesInformationWizardPage.java
Tue Sep 18 08:33:19 2007
@@ -74,11 +74,11 @@
         Label informationLabel = new Label( composite, SWT.WRAP );
         informationLabel.setText( informationString );
         informationLabel.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, true )
);
-        
+
         // Warning Label
-        Label warningLabel = new Label( composite, SWT.NONE);
+        Label warningLabel = new Label( composite, SWT.NONE );
         warningLabel.setImage( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
-            PluginConstants.IMG_WARNING_32X32).createImage() );
+            PluginConstants.IMG_WARNING_32X32 ).createImage() );
         warningLabel.setLayoutData( new GridData( SWT.CENTER, SWT.BOTTOM, true, true ) );
 
         setControl( composite );

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
Tue Sep 18 08:33:19 2007
@@ -97,7 +97,7 @@
 
             // Reseting the Exception Thrown
             exceptionThrown = null;
-            
+
             try
             {
                 getContainer().run( true, false, new IRunnableWithProgress()

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java?rev=576950&r1=576949&r2=576950&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java
Tue Sep 18 08:33:19 2007
@@ -197,7 +197,7 @@
                 return ProjectType.OFFLINE;
             }
         }
-        
+
         // Default
         return ProjectType.OFFLINE;
     }



Mime
View raw message