directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r558659 - /directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/
Date Mon, 23 Jul 2007 08:47:11 GMT
Author: pamarcelot
Date: Mon Jul 23 01:47:10 2007
New Revision: 558659

URL: http://svn.apache.org/viewvc?view=rev&rev=558659
Log:
Added missing strings in the AttributeTypeEditor.
Code formating.

Modified:
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
    directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java

Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java?view=diff&rev=558659&r1=558658&r2=558659
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
(original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
Mon Jul 23 01:47:10 2007
@@ -45,11 +45,13 @@
         }
         else if ( o1 instanceof MatchingRuleImpl && o2 instanceof NonExistingMatchingRule
)
         {
-            return ( ( MatchingRuleImpl ) o1 ).getName().compareToIgnoreCase( ( ( NonExistingMatchingRule
) o2 ).getName() );
+            return ( ( MatchingRuleImpl ) o1 ).getName().compareToIgnoreCase(
+                ( ( NonExistingMatchingRule ) o2 ).getName() );
         }
         else if ( o1 instanceof NonExistingMatchingRule && o2 instanceof MatchingRuleImpl
)
         {
-            return ( ( NonExistingMatchingRule ) o1 ).getName().compareToIgnoreCase( ( (
MatchingRuleImpl ) o2 ).getName() );
+            return ( ( NonExistingMatchingRule ) o1 ).getName().compareToIgnoreCase(
+                ( ( MatchingRuleImpl ) o2 ).getName() );
         }
         else if ( o1 instanceof NonExistingMatchingRule && o2 instanceof NonExistingMatchingRule
)
         {

Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java?view=diff&rev=558659&r1=558658&r2=558659
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
(original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
Mon Jul 23 01:47:10 2007
@@ -41,8 +41,8 @@
         if ( obj instanceof SyntaxImpl )
         {
             SyntaxImpl syntax = ( SyntaxImpl ) obj;
-            
-            return syntax.getName() + "  -  (" + syntax.getOid()  + ")";
+
+            return syntax.getName() + "  -  (" + syntax.getOid() + ")";
         }
         else if ( obj instanceof NonExistingSyntax )
         {

Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?view=diff&rev=558659&r1=558658&r2=558659
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
(original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
Mon Jul 23 01:47:10 2007
@@ -666,8 +666,8 @@
         // General Information Section
         Section section_general_information = toolkit.createSection( parent, Section.DESCRIPTION
| Section.EXPANDED
             | Section.TITLE_BAR );
-        section_general_information.setDescription( "General Section Description" ); //TODO
-        section_general_information.setText( "General Section Text" ); //TODO
+        section_general_information.setDescription( "Specify general information (name, OID,
etc.)." );
+        section_general_information.setText( "General information" );
 
         // Creating the layout of the section
         Composite client_general_information = toolkit.createComposite( section_general_information
);
@@ -680,7 +680,7 @@
 
         // Adding elements to the section
         // ALIASES Button
-        toolkit.createLabel( client_general_information, "Aliases" );
+        toolkit.createLabel( client_general_information, "Aliases:" );
         aliasesLabel = toolkit.createLabel( client_general_information, "" ); //$NON-NLS-1$
         aliasesLabel.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false, 2, 1
) );
         toolkit.createLabel( client_general_information, "" ); //$NON-NLS-1$
@@ -688,24 +688,24 @@
         aliasesButton.setLayoutData( new GridData( SWT.NONE, SWT.NONE, false, false, 2, 1
) );
 
         // OID Field
-        toolkit.createLabel( client_general_information, "OID" );
+        toolkit.createLabel( client_general_information, "OID:" );
         oidText = toolkit.createText( client_general_information, "" ); //$NON-NLS-1$
         oidText.setLayoutData( new GridData( SWT.FILL, 0, true, false, 2, 1 ) );
 
         // DESCRIPTION Field
-        toolkit.createLabel( client_general_information, "Description" );
+        toolkit.createLabel( client_general_information, "Description:" );
         descriptionText = toolkit.createText( client_general_information, "", SWT.MULTI |
SWT.V_SCROLL ); //$NON-NLS-1$
         GridData descriptionGridData = new GridData( SWT.FILL, SWT.NONE, true, false, 2,
1 );
         descriptionGridData.heightHint = 42;
         descriptionText.setLayoutData( descriptionGridData );
 
         // SCHEMA Field
-        schemaLink = toolkit.createHyperlink( client_general_information, "Schema", SWT.WRAP
);
+        schemaLink = toolkit.createHyperlink( client_general_information, "Schema:", SWT.WRAP
);
         schemaLabel = toolkit.createLabel( client_general_information, "" ); //$NON-NLS-1$
         schemaLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 )
);
 
         // SUP Combo
-        supLabel = toolkit.createHyperlink( client_general_information, "Superior_type",
SWT.WRAP );
+        supLabel = toolkit.createHyperlink( client_general_information, "Superior type:",
SWT.WRAP );
         supCombo = new Combo( client_general_information, SWT.READ_ONLY | SWT.SINGLE );
         supCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
         supComboViewer = new ComboViewer( supCombo );
@@ -713,13 +713,13 @@
         supComboViewer.setLabelProvider( new ATESuperiorComboLabelProvider() );
 
         // USAGE Combo
-        toolkit.createLabel( client_general_information, "Usage" );
+        toolkit.createLabel( client_general_information, "Usage:" );
         usageCombo = new Combo( client_general_information, SWT.READ_ONLY | SWT.SINGLE );
         usageCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
         initUsageCombo();
 
         // SYNTAX Combo
-        toolkit.createLabel( client_general_information, "Synatx" );
+        toolkit.createLabel( client_general_information, "Syntax:" );
         syntaxCombo = new Combo( client_general_information, SWT.READ_ONLY | SWT.SINGLE );
         syntaxCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 )
);
         syntaxComboViewer = new ComboViewer( syntaxCombo );
@@ -727,7 +727,7 @@
         syntaxComboViewer.setLabelProvider( new ATESyntaxComboLabelProvider() );
 
         // SYNTAX LENGTH Field
-        toolkit.createLabel( client_general_information, "Syntax_length" );
+        toolkit.createLabel( client_general_information, "Syntax length:" );
         syntaxLengthText = toolkit.createText( client_general_information, "" ); //$NON-NLS-1$
         syntaxLengthText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2,
1 ) );
 
@@ -765,8 +765,8 @@
         // Matching Rules Section
         Section section_matching_rules = toolkit.createSection( parent, Section.DESCRIPTION
| Section.EXPANDED
             | Section.TITLE_BAR );
-        section_matching_rules.setDescription( "AttributeTypeEditorOverviewPage.Specify_matching_rules"
); //TODO
-        section_matching_rules.setText( "AttributeTypeEditorOverviewPage.Matching_Rules"
); //TODO
+        section_matching_rules.setDescription( "Specify matching rules (Equality, Ordering
& Substring)." );
+        section_matching_rules.setText( "Matching Rules" );
 
         // Creating the layout of the section
         Composite client_matching_rules = toolkit.createComposite( section_matching_rules
);
@@ -778,7 +778,7 @@
         section_matching_rules.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true
) );
 
         // EQUALITY Combo
-        toolkit.createLabel( client_matching_rules, "Equality" );
+        toolkit.createLabel( client_matching_rules, "Equality:" );
         equalityCombo = new Combo( client_matching_rules, SWT.READ_ONLY | SWT.SINGLE );
         equalityCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
         equalityComboViewer = new ComboViewer( equalityCombo );
@@ -786,7 +786,7 @@
         equalityComboViewer.setLabelProvider( new ATEMatchingRulesComboLabelProvider() );
 
         // ORDERING Combo
-        toolkit.createLabel( client_matching_rules, "Ordering" );
+        toolkit.createLabel( client_matching_rules, "Ordering:" );
         orderingCombo = new Combo( client_matching_rules, SWT.READ_ONLY | SWT.SINGLE );
         orderingCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
         orderingComboViewer = new ComboViewer( orderingCombo );
@@ -794,7 +794,7 @@
         orderingComboViewer.setLabelProvider( new ATEMatchingRulesComboLabelProvider() );
 
         // SUBSTRING Combo
-        toolkit.createLabel( client_matching_rules, "Substring" );
+        toolkit.createLabel( client_matching_rules, "Substring:" );
         substringCombo = new Combo( client_matching_rules, SWT.READ_ONLY | SWT.SINGLE );
         substringCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
         substringComboViewer = new ComboViewer( substringCombo );
@@ -1082,31 +1082,6 @@
         }
     }
 
-
-    //    /**
-    //     * Enalbes/Disables the UI fields
-    //     */
-    //    private void setFieldsEditableState()
-    //    {
-    //        if ( modifiedAttributeType.getOriginatingSchema().type == Schema.SchemaType.coreSchema
)
-    //        {
-    //            // If the attribute type is in a core-schema file, we disable editing
-    //            aliasesButton.setEnabled( false );
-    //            oidText.setEditable( false );
-    //            descriptionText.setEditable( false );
-    //            supCombo.setEnabled( false );
-    //            usageCombo.setEnabled( false );
-    //            syntaxCombo.setEnabled( false );
-    //            syntaxLengthText.setEditable( false );
-    //            obsoleteCheckbox.setEnabled( false );
-    //            singleValueCheckbox.setEnabled( false );
-    //            collectiveCheckbox.setEnabled( false );
-    //            noUserModificationCheckbox.setEnabled( false );
-    //            equalityCombo.setEnabled( false );
-    //            orderingCombo.setEnabled( false );
-    //            substringCombo.setEnabled( false );
-    //        }
-    //    }
 
     /**
      * Adds listeners to UI fields



Mime
View raw message