directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1694538 [2/3] - in /directory/studio/trunk/plugins: connection.core/src/main/java/org/apache/directory/studio/connection/core/ connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/ ldapbrowser.common/src/main/java...
Date Thu, 06 Aug 2015 16:45:21 GMT
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IValue.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IValue.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IValue.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IValue.java Thu Aug  6 16:45:20 2015
@@ -39,7 +39,6 @@ import org.eclipse.core.runtime.IAdaptab
 public interface IValue extends Serializable, IAdaptable, ValuePropertyPageProvider, AttributePropertyPageProvider,
     EntryPropertyPageProvider, ConnectionPropertyPageProvider
 {
-
     /**
      * EmptyValue is used to indicate an empty value.
      *
@@ -47,13 +46,12 @@ public interface IValue extends Serializ
      */
     interface EmptyValue
     {
-
         /**
          * Gets the string value.
          *
          * @return the string value
          */
-        public String getStringValue();
+        String getStringValue();
 
 
         /**
@@ -61,7 +59,7 @@ public interface IValue extends Serializ
          * 
          * @return the binary value
          */
-        public byte[] getBinaryValue();
+        byte[] getBinaryValue();
 
 
         /**
@@ -69,7 +67,7 @@ public interface IValue extends Serializ
          * 
          * @return true, if is string
          */
-        public boolean isString();
+        boolean isString();
 
 
         /**
@@ -77,13 +75,13 @@ public interface IValue extends Serializ
          * 
          * @return true, if is binary
          */
-        public boolean isBinary();
+        boolean isBinary();
     }
 
     /**
      * This object represents the empty string value.
      */
-    public static final EmptyValue EMPTY_STRING_VALUE = new EmptyValue()
+    EmptyValue EMPTY_STRING_VALUE = new EmptyValue()
     {
 
         /**
@@ -134,7 +132,7 @@ public interface IValue extends Serializ
     /**
      * This object represents the empty binary value.
      */
-    public static final EmptyValue EMPTY_BINARY_VALUE = new EmptyValue()
+    EmptyValue EMPTY_BINARY_VALUE = new EmptyValue()
     {
 
         /**
@@ -188,7 +186,7 @@ public interface IValue extends Serializ
      * 
      * @return The attribute of this value, never null.
      */
-    public abstract IAttribute getAttribute();
+    IAttribute getAttribute();
 
 
     /**
@@ -196,7 +194,7 @@ public interface IValue extends Serializ
      * 
      * @return The raw value or an EmptyValue, never null.
      */
-    public abstract Object getRawValue();
+    Object getRawValue();
 
 
     /**
@@ -207,7 +205,7 @@ public interface IValue extends Serializ
      * 
      * @return the String value
      */
-    public abstract String getStringValue();
+    String getStringValue();
 
 
     /**
@@ -218,7 +216,7 @@ public interface IValue extends Serializ
      * 
      * @return the binary value
      */
-    public abstract byte[] getBinaryValue();
+    byte[] getBinaryValue();
 
 
     /**
@@ -228,7 +226,7 @@ public interface IValue extends Serializ
      * 
      * @return true if the value is empty.
      */
-    public abstract boolean isEmpty();
+    boolean isEmpty();
 
 
     /**
@@ -236,7 +234,7 @@ public interface IValue extends Serializ
      * 
      * @return true if the values attribute is string.
      */
-    public abstract boolean isString();
+    boolean isString();
 
 
     /**
@@ -244,7 +242,7 @@ public interface IValue extends Serializ
      * 
      * @return true if the values attribute is binary.
      */
-    public abstract boolean isBinary();
+    boolean isBinary();
 
 
     /**
@@ -252,7 +250,7 @@ public interface IValue extends Serializ
      * 
      * @return true if this value is part of its entry's Rdn.
      */
-    public abstract boolean isRdnPart();
+    boolean isRdnPart();
 
 
     /**
@@ -266,6 +264,5 @@ public interface IValue extends Serializ
      *                The value to compare, must be of type IValue
      * @return true if the argument is equal to this.
      */
-    public abstract boolean equals( Object o );
-
+    boolean equals( Object o );
 }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/SchemaObjectLoader.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/SchemaObjectLoader.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/SchemaObjectLoader.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/SchemaObjectLoader.java Thu Aug  6 16:45:20 2015
@@ -57,7 +57,7 @@ public class SchemaObjectLoader
          * @param schemaObjectNamesList the schema object names list
          * @param oidsList the OIDs name list
          */
-        public void add( Schema schema, List<String> schemaObjectNamesList, List<String> oidsList );
+        void add( Schema schema, List<String> schemaObjectNamesList, List<String> oidsList );
     }
     
     

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/IEntryEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/IEntryEditor.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/IEntryEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/IEntryEditor.java Thu Aug  6 16:45:20 2015
@@ -38,7 +38,7 @@ public interface IEntryEditor
      * 
      * @return true if this editor can handle the entry, false otherwise.
      */
-    public boolean canHandle( IEntry entry );
+    boolean canHandle( IEntry entry );
 
 
     /**
@@ -46,7 +46,7 @@ public interface IEntryEditor
      * 
      * @param source the source of the modification, may be null
      */
-    public void workingCopyModified( Object source );
+    void workingCopyModified( Object source );
 
 
     /**
@@ -54,7 +54,7 @@ public interface IEntryEditor
      * 
      * @return the entry editor input, null if no input was set
      */
-    public EntryEditorInput getEntryEditorInput();
+    EntryEditorInput getEntryEditorInput();
 
 
     /**
@@ -63,6 +63,5 @@ public interface IEntryEditor
      * 
      * @return true, if the editor uses auto save
      */
-    public boolean isAutoSave();
-
+    boolean isAutoSave();
 }

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java Thu Aug  6 16:45:20 2015
@@ -145,18 +145,18 @@ public class ConnectionViewActionGroup e
     {
 
         // add
-        menuManager.add( ( IAction ) connectionActionMap.get( newConnectionAction ) );
-        menuManager.add( ( IAction ) connectionActionMap.get( newConnectionFolderAction ) );
+        menuManager.add( ( IAction ) connectionActionMap.get( NEW_CONNECTION_ACTION ) );
+        menuManager.add( ( IAction ) connectionActionMap.get( NEW_CONNECTION_FOLDER_ACTION ) );
         menuManager.add( new Separator() );
 
         // open/close
-        if ( ( ( IAction ) connectionActionMap.get( closeConnectionAction ) ).isEnabled() )
+        if ( ( ( IAction ) connectionActionMap.get( CLOSE_CONNECTION_ACTION ) ).isEnabled() )
         {
-            menuManager.add( ( IAction ) connectionActionMap.get( closeConnectionAction ) );
+            menuManager.add( ( IAction ) connectionActionMap.get( CLOSE_CONNECTION_ACTION ) );
         }
-        else if ( ( ( IAction ) connectionActionMap.get( openConnectionAction ) ).isEnabled() )
+        else if ( ( ( IAction ) connectionActionMap.get( OPEN_CONNECTION_ACTION ) ).isEnabled() )
         {
-            menuManager.add( ( IAction ) connectionActionMap.get( openConnectionAction ) );
+            menuManager.add( ( IAction ) connectionActionMap.get( OPEN_CONNECTION_ACTION ) );
         }
         menuManager.add( new Separator() );
 
@@ -165,10 +165,10 @@ public class ConnectionViewActionGroup e
         menuManager.add( new Separator() );
 
         // copy/paste/...
-        menuManager.add( ( IAction ) connectionActionMap.get( copyConnectionAction ) );
-        menuManager.add( ( IAction ) connectionActionMap.get( pasteConnectionAction ) );
-        menuManager.add( ( IAction ) connectionActionMap.get( deleteConnectionAction ) );
-        menuManager.add( ( IAction ) connectionActionMap.get( renameConnectionAction ) );
+        menuManager.add( ( IAction ) connectionActionMap.get( COPY_CONNECTION_ACTION ) );
+        menuManager.add( ( IAction ) connectionActionMap.get( PASTE_CONNECTION_ACTION ) );
+        menuManager.add( ( IAction ) connectionActionMap.get( DELETE_CONNECTION_ACTION ) );
+        menuManager.add( ( IAction ) connectionActionMap.get( RENAME_CONNECTION_ACTION ) );
         menuManager.add( new Separator() );
 
         // import/export
@@ -197,7 +197,7 @@ public class ConnectionViewActionGroup e
         menuManager.add( new Separator() );
 
         // properties
-        menuManager.add( ( IAction ) connectionActionMap.get( propertyDialogAction ) );
+        menuManager.add( ( IAction ) connectionActionMap.get( PROPERTY_DIALOG_ACTION ) );
     }
 
 }

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapter.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapter.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapter.java Thu Aug  6 16:45:20 2015
@@ -42,7 +42,7 @@ public interface LdapServerAdapter
      * @throws Exception
      *      if an error occurs when adding the server
      */
-    public void add( LdapServer server, StudioProgressMonitor monitor ) throws Exception;
+    void add( LdapServer server, StudioProgressMonitor monitor ) throws Exception;
 
 
     /**
@@ -55,7 +55,7 @@ public interface LdapServerAdapter
      * @throws Exception
      *      if an error occurs when deleting the server
      */
-    public void delete( LdapServer server, StudioProgressMonitor monitor ) throws Exception;
+    void delete( LdapServer server, StudioProgressMonitor monitor ) throws Exception;
 
 
     /**
@@ -68,7 +68,7 @@ public interface LdapServerAdapter
      * @throws Exception
      *      if an error occurs when opening the configuration of the server
      */
-    public void openConfiguration( LdapServer server, StudioProgressMonitor monitor ) throws Exception;
+    void openConfiguration( LdapServer server, StudioProgressMonitor monitor ) throws Exception;
 
 
     /**
@@ -81,7 +81,7 @@ public interface LdapServerAdapter
      * @throws Exception
      *      if an error occurs when starting the server
      */
-    public void start( LdapServer server, StudioProgressMonitor monitor ) throws Exception;
+    void start( LdapServer server, StudioProgressMonitor monitor ) throws Exception;
 
 
     /**
@@ -94,7 +94,7 @@ public interface LdapServerAdapter
      * @throws Exception
      *      if an error occurs when stopping the server
      */
-    public void stop( LdapServer server, StudioProgressMonitor monitor ) throws Exception;
+    void stop( LdapServer server, StudioProgressMonitor monitor ) throws Exception;
 
 
     /**
@@ -107,5 +107,5 @@ public interface LdapServerAdapter
      * @throws Exception
      *      if an error occurs when checking the ports before the server starts
      */
-    public String[] checkPortsBeforeServerStart( LdapServer server ) throws Exception;
+    String[] checkPortsBeforeServerStart( LdapServer server ) throws Exception;
 }

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPage.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPage.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPage.java Thu Aug  6 16:45:20 2015
@@ -38,7 +38,7 @@ public interface LdapServerAdapterConfig
      * @param parent the parent control
      * @return the created control
      */
-    public Control createControl( Composite parent );
+    Control createControl( Composite parent );
 
 
     /**
@@ -46,7 +46,7 @@ public interface LdapServerAdapterConfig
      *
      * @return the description
      */
-    public String getDescription();
+    String getDescription();
 
 
     /**
@@ -54,7 +54,7 @@ public interface LdapServerAdapterConfig
      *
      * @return the error message
      */
-    public String getErrorMessage();
+    String getErrorMessage();
 
 
     /**
@@ -62,7 +62,7 @@ public interface LdapServerAdapterConfig
      *
      * @return the ID
      */
-    public String getId();
+    String getId();
 
 
     /**
@@ -70,7 +70,7 @@ public interface LdapServerAdapterConfig
      *
      * @return the {@link ImageDescriptor}
      */
-    public ImageDescriptor getImageDescriptor();
+    ImageDescriptor getImageDescriptor();
 
 
     /**
@@ -78,7 +78,7 @@ public interface LdapServerAdapterConfig
      *
      * @return the title
      */
-    public String getTitle();
+    String getTitle();
 
 
     /**
@@ -87,7 +87,7 @@ public interface LdapServerAdapterConfig
      * @return <code>true</code> if the page is complete,
      *         <code>false</code> if not.
      */
-    public boolean isPageComplete();
+    boolean isPageComplete();
 
 
     /**
@@ -95,7 +95,7 @@ public interface LdapServerAdapterConfig
      *
      * @param ldapServer the LDAP server
      */
-    public void loadConfiguration( LdapServer ldapServer );
+    void loadConfiguration( LdapServer ldapServer );
 
 
     /**
@@ -103,7 +103,7 @@ public interface LdapServerAdapterConfig
      *
      * @param ldapServer the LDAP server
      */
-    public void saveConfiguration( LdapServer ldapServer );
+    void saveConfiguration( LdapServer ldapServer );
 
 
     /**
@@ -111,11 +111,11 @@ public interface LdapServerAdapterConfig
      *
      * @param modifyListener the modify listener
      */
-    public void setModifyListener( LdapServerAdapterConfigurationPageModifyListener modifyListener );
+    void setModifyListener( LdapServerAdapterConfigurationPageModifyListener modifyListener );
 
 
     /**
      * Validates the configuration page
      */
-    public void validate();
+    void validate();
 }

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPageModifyListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPageModifyListener.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPageModifyListener.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPageModifyListener.java Thu Aug  6 16:45:20 2015
@@ -29,5 +29,5 @@ public interface LdapServerAdapterConfig
     /**
      * Indicates that the configuration page was modified.
      */
-    public void configurationPageModified();
+    void configurationPageModified();
 }
\ No newline at end of file

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerListener.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerListener.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerListener.java Thu Aug  6 16:45:20 2015
@@ -27,12 +27,10 @@ package org.apache.directory.studio.ldap
  */
 public interface LdapServerListener
 {
-
     /**
      * This method is called when the server is changed.
      *
-     * @param event
-     *      the server event
+     * @param event the server event
      */
-    public void serverChanged( LdapServerEvent event );
+    void serverChanged( LdapServerEvent event );
 }

Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ILdifEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ILdifEditor.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ILdifEditor.java (original)
+++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ILdifEditor.java Thu Aug  6 16:45:20 2015
@@ -36,17 +36,15 @@ public interface ILdifEditor extends IAd
     /**
      * Gets the LDIF Model
      *
-     * @return
-     *      the LDIF Model
+     * @return the LDIF Model
      */
-    public LdifFile getLdifModel();
+    LdifFile getLdifModel();
 
 
     /**
      * Gets the Connection
      * 
-     * @return
-     *      the Connection
+     * @return the Connection
      */
-    public IBrowserConnection getConnection();
+    IBrowserConnection getConnection();
 }

Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java Thu Aug  6 16:45:20 2015
@@ -40,13 +40,13 @@ public final class LdifEOFPart implement
     }
 
 
-    public final int getOffset()
+    public int getOffset()
     {
         return offset;
     }
 
 
-    public final int getLength()
+    public int getLength()
     {
         return 0;
     }
@@ -55,7 +55,7 @@ public final class LdifEOFPart implement
     /**
      * @return The raw version of a EOF part : an empty String
      */
-    public final String toRawString()
+    public String toRawString()
     {
         return ""; //$NON-NLS-1$
     }
@@ -64,31 +64,31 @@ public final class LdifEOFPart implement
     /**
      * @return The formatted version of a EOF part : an empty String
      */
-    public final String toFormattedString( LdifFormatParameters formatParameters )
+    public String toFormattedString( LdifFormatParameters formatParameters )
     {
         return ""; //$NON-NLS-1$
     }
 
 
-    public final String toString()
+    public String toString()
     {
         return getClass().getName() + " (" + getOffset() + "," + getLength() + "): ''"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     }
 
 
-    public final boolean isValid()
+    public boolean isValid()
     {
         return true;
     }
 
 
-    public final String getInvalidString()
+    public String getInvalidString()
     {
         return ""; //$NON-NLS-1$
     }
 
 
-    public final void adjustOffset( int adjust )
+    public void adjustOffset( int adjust )
     {
         offset += adjust;
     }

Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEnumeration.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEnumeration.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEnumeration.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEnumeration.java Thu Aug  6 16:45:20 2015
@@ -34,12 +34,12 @@ public interface LdifEnumeration
     /**
      * @return true if this enumeration has more elements.
      */
-    public boolean hasNext() throws Exception;
+    boolean hasNext() throws Exception;
 
 
     /**
      * 
      * @return the next LDIF container or null if hasNext() returns false.
      */
-    public LdifContainer next() throws Exception;
+    LdifContainer next() throws Exception;
 }

Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java Thu Aug  6 16:45:20 2015
@@ -43,13 +43,13 @@ public final class LdifInvalidPart imple
     }
 
 
-    public final int getOffset()
+    public int getOffset()
     {
         return offset;
     }
 
 
-    public final int getLength()
+    public int getLength()
     {
         return toRawString().length();
     }
@@ -58,19 +58,19 @@ public final class LdifInvalidPart imple
     /**
      * @return The raw version of a Invalid part : the invalid String, unchanged
      */
-    public final String toRawString()
+    public String toRawString()
     {
         return unknown;
     }
 
 
-    public final String toFormattedString( LdifFormatParameters formatParameters )
+    public String toFormattedString( LdifFormatParameters formatParameters )
     {
         return unknown;
     }
 
 
-    public final String toString()
+    public String toString()
     {
         String text = toRawString();
         text = LdifUtils.convertNlRcToString( text );
@@ -79,7 +79,7 @@ public final class LdifInvalidPart imple
     }
 
 
-    public final boolean isValid()
+    public boolean isValid()
     {
         return false;
     }
@@ -91,7 +91,7 @@ public final class LdifInvalidPart imple
     }
 
 
-    public final void adjustOffset( int adjust )
+    public void adjustOffset( int adjust )
     {
         offset += adjust;
     }

Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifPart.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifPart.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifPart.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifPart.java Thu Aug  6 16:45:20 2015
@@ -34,13 +34,13 @@ public interface LdifPart
     /**
      * @return The position of this part in the LDIF file
      */
-    public int getOffset();
+    int getOffset();
 
 
     /**
      * @return The length of this part
      */
-    public int getLength();
+    int getLength();
 
 
     /**
@@ -48,18 +48,17 @@ public interface LdifPart
      * 
      * @return <code>true</code> if the part is valid.
      */
-    public boolean isValid();
+    boolean isValid();
 
 
-    public String getInvalidString();
+    String getInvalidString();
 
 
-    public String toRawString();
+    String toRawString();
 
 
-    public String toFormattedString( LdifFormatParameters formatParameters );
+    String toFormattedString( LdifFormatParameters formatParameters );
 
 
-    public void adjustOffset( int adjust );
-
+    void adjustOffset( int adjust );
 }

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginConstants.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginConstants.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginConstants.java Thu Aug  6 16:45:20 2015
@@ -28,20 +28,20 @@ package org.apache.directory.studio.open
 public interface OpenLdapConfigurationPluginConstants
 {
     /** The plug-in ID */
-    public static final String PLUGIN_ID = OpenLdapConfigurationPlugin.getDefault().getPluginProperties()
+    String PLUGIN_ID = OpenLdapConfigurationPlugin.getDefault().getPluginProperties()
         .getString( "Plugin_id" ); //$NON-NLS-1$
 
     // ------
     // IMAGES
     // ------
-    public static final String IMG_ATTRIBUTE = "resources/icons/attribute.gif"; //$NON-NLS-1$
-    public static final String IMG_DATABASE = "resources/icons/database.gif"; //$NON-NLS-1$
-    public static final String IMG_DISABLED_DATABASE = "resources/icons/disabledDatabase.gif"; //$NON-NLS-1$
-    public static final String IMG_EDITOR = "resources/icons/editor.gif"; //$NON-NLS-1$
-    public static final String IMG_EXPORT = "resources/icons/export.gif"; //$NON-NLS-1$
-    public static final String IMG_INDEX = "resources/icons/index.png"; //$NON-NLS-1$
-    public static final String IMG_INFORMATION = "resources/icons/information.gif"; //$NON-NLS-1$
-    public static final String IMG_IMPORT = "resources/icons/import.gif"; //$NON-NLS-1$
-    public static final String IMG_OVERLAY = "resources/icons/overlay.gif"; //$NON-NLS-1$
-    public static final String IMG_LDAP_SERVER = "resources/icons/server.gif"; //$NON-NLS-1$
+    String IMG_ATTRIBUTE = "resources/icons/attribute.gif"; //$NON-NLS-1$
+    String IMG_DATABASE = "resources/icons/database.gif"; //$NON-NLS-1$
+    String IMG_DISABLED_DATABASE = "resources/icons/disabledDatabase.gif"; //$NON-NLS-1$
+    String IMG_EDITOR = "resources/icons/editor.gif"; //$NON-NLS-1$
+    String IMG_EXPORT = "resources/icons/export.gif"; //$NON-NLS-1$
+    String IMG_INDEX = "resources/icons/index.png"; //$NON-NLS-1$
+    String IMG_INFORMATION = "resources/icons/information.gif"; //$NON-NLS-1$
+    String IMG_IMPORT = "resources/icons/import.gif"; //$NON-NLS-1$
+    String IMG_OVERLAY = "resources/icons/overlay.gif"; //$NON-NLS-1$
+    String IMG_LDAP_SERVER = "resources/icons/server.gif"; //$NON-NLS-1$
 }

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationInput.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationInput.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationInput.java Thu Aug  6 16:45:20 2015
@@ -36,7 +36,7 @@ public interface ServerConfigurationInpu
      *
      * @return the original configuration partition
      */
-    public EntryBasedConfigurationPartition getOriginalPartition();
+    EntryBasedConfigurationPartition getOriginalPartition();
 
 
     /**
@@ -44,5 +44,5 @@ public interface ServerConfigurationInpu
      *
      * @param originalPartition the original configuration 
      */
-    public void setOriginalPartition( EntryBasedConfigurationPartition originalPartition );
+    void setOriginalPartition( EntryBasedConfigurationPartition originalPartition );
 }

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseSpecificDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseSpecificDetailsBlock.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseSpecificDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseSpecificDetailsBlock.java Thu Aug  6 16:45:20 2015
@@ -37,7 +37,7 @@ public interface DatabaseSpecificDetails
      * @param parent the parent composite
      * @param toolkit the toolkit
      */
-    public Composite createBlockContent( Composite parent, FormToolkit toolkit );
+    Composite createBlockContent( Composite parent, FormToolkit toolkit );
 
 
     /**
@@ -45,13 +45,13 @@ public interface DatabaseSpecificDetails
      *
      * @return the associated details page.
      */
-    public DatabasesDetailsPage getDetailsPage();
+    DatabasesDetailsPage getDetailsPage();
 
 
     /**
      * Refreshes the UI based on the input.
      */
-    public void refresh();
+    void refresh();
 
 
     /**

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java Thu Aug  6 16:45:20 2015
@@ -31,6 +31,7 @@ import org.apache.directory.studio.commo
 import org.apache.directory.studio.common.ui.widgets.TableWidget;
 import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
 import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.wrappers.StringValueWrapper;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.openldap.common.ui.model.RequireConditionEnum;
@@ -201,14 +202,14 @@ import org.eclipse.ui.forms.widgets.Sect
  * | | Requires :                                         | |
  * | |   +------------------------------------+           | |
  * | |   |                                    | (Add...)  | |
- * | |   |                                    | (Edit...) | |
  * | |   |                                    | (Delete)  | |
+ * | |   |                                    |           | |
  * | |   +------------------------------------+           | |
  * | | Restrict :                                         | |
  * | |   +------------------------------------+           | |
  * | |   |                                    | (Add...)  | |
- * | |   |                                    | (Edit...) | |
  * | |   |                                    | (Delete)  | |
+ * | |   |                                    |           | |
  * | |   +------------------------------------+           | |
  * | | Security Strength Factors :                        | |
  * | |   +------------------------------------+           | |
@@ -357,6 +358,7 @@ public class DatabasesDetailsPage implem
     /** The olcSchemaDN attribute */
     private EntryWidget schemaDnEntryWidget;
 
+    // The Security UI Widgets
     /** The olcReadOnly attribute */
     private Button readOnlyButton;
 
@@ -371,6 +373,14 @@ public class DatabasesDetailsPage implem
     
     /** The olcSecurity table widget */
     private TableWidget<SsfWrapper> securityTableWidget;
+    
+    // The Access UI Widgets
+    /** The olcAddContentAcl Button */
+    private Button addContentAclCheckbox;
+
+    /** The olcAcess Table */
+    private TableWidget<StringValueWrapper> aclsTableWidget;
+
 
 
     /** The associated overlays */
@@ -393,9 +403,6 @@ public class DatabasesDetailsPage implem
     /** The olcLastMod flag */
     private BooleanWithDefaultWidget lastModBooleanWithDefaultWidget;
     
-    /** The olcAddContentAcl flag */
-    private BooleanWithDefaultWidget addContentAclBooleanWithDefaultWidget;
-    
     /** The olMonitoring flag */
     private BooleanWithDefaultWidget monitoringBooleanWithDefaultWidget;
     
@@ -658,6 +665,26 @@ public class DatabasesDetailsPage implem
             setEditorDirty();
         }
     };
+
+    
+    /** 
+     * The modify listener which set the editor dirty 
+     **/
+    private SelectionListener dirtySelectionListener = new SelectionListener()
+    {
+        
+        @Override
+        public void widgetSelected( SelectionEvent e )
+        {
+            setEditorDirty();
+        }
+        
+        @Override
+        public void widgetDefaultSelected( SelectionEvent e )
+        {
+            // TODO Auto-generated method stub
+        }
+    };
     
     
     /**
@@ -792,7 +819,7 @@ public class DatabasesDetailsPage implem
         createGeneralSettingsSection( parent, toolkit );
         createLimitsSettingsSection( parent, toolkit );
         createSecuritySettingsSection( parent, toolkit );
-        //createAccessSettingsSection( parent, toolkit );
+        createAccessSettingsSection( parent, toolkit );
         createOverlaySettingsSection( parent, toolkit );
         createReplicationConsumersSettingsSection( parent, toolkit );
         //createOptionsSettingsSection( parent, toolkit );
@@ -920,32 +947,6 @@ public class DatabasesDetailsPage implem
         schemaDnTextDecoration.setDescriptionText( 
             "Specify the distinguished name for the subschema subentry that controls the entries on this server" );
 
-        // Read Only
-        toolkit.createLabel( composite, "Read Only:" );
-        readOnlyBooleanWithDefaultWidget = new BooleanWithDefaultWidget();
-        readOnlyBooleanWithDefaultWidget.create( composite, toolkit );
-        readOnlyBooleanWithDefaultWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-        ControlDecoration readOnlyCheckboxDecoration = new ControlDecoration(
-            readOnlyBooleanWithDefaultWidget.getControl(), SWT.CENTER | SWT.RIGHT );
-        readOnlyCheckboxDecoration.setImage( OpenLdapConfigurationPlugin.getDefault().getImageDescriptor(
-            OpenLdapConfigurationPluginConstants.IMG_INFORMATION ).createImage() );
-        readOnlyCheckboxDecoration.setMarginWidth( 4 );
-        readOnlyCheckboxDecoration
-            .setDescriptionText( "Sets the database into \"read-only\" mode. Any attempts to modify the database will return an \"unwilling to perform\" error." );
-
-        // Hidden
-        toolkit.createLabel( composite, "Hidden:" );
-        hiddenBooleanWithDefaultWidget = new BooleanWithDefaultWidget( false );
-        hiddenBooleanWithDefaultWidget.create( composite, toolkit );
-        hiddenBooleanWithDefaultWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-        ControlDecoration hiddenCheckboxDecoration = new ControlDecoration(
-            hiddenBooleanWithDefaultWidget.getControl(), SWT.CENTER | SWT.RIGHT );
-        hiddenCheckboxDecoration.setImage( OpenLdapConfigurationPlugin.getDefault().getImageDescriptor(
-            OpenLdapConfigurationPluginConstants.IMG_INFORMATION ).createImage() );
-        hiddenCheckboxDecoration.setMarginWidth( 4 );
-        hiddenCheckboxDecoration
-            .setDescriptionText( "Sets whether the database will be used to answer queries." );
-        
         // mirrorMode
         toolkit.createLabel( composite, "Mirror Mode:" );
         mirrorModeBooleanWithDefaultWidget = new BooleanWithDefaultWidget();
@@ -960,7 +961,7 @@ public class DatabasesDetailsPage implem
         mirrorModeCheckboxDecoration
             .setDescriptionText( "Sets the database in MirrorMode. This is only useful in a Multi-Master configuration" );
         
-        // disabled (only in OpenLDAP 2.4.36
+        // disabled (only in OpenLDAP 2.4.36)
         if ( browserConnection.getSchema().hasAttributeTypeDescription( "olcDisabled" ) )
         {
             toolkit.createLabel( composite, "Disabled:" );
@@ -990,19 +991,6 @@ public class DatabasesDetailsPage implem
         lastModCheckboxDecoration.setMarginWidth( 4 );
         lastModCheckboxDecoration.setDescriptionText( "Controls whether slapd will automatically maintain the modifiersName, modifyTimestamp, creatorsName, and createTimestamp attributes for entries" );
         
-        // The olcAddAclContent parameter : Controls whether Add operations will perform ACL checks on the content of the entry being added
-        toolkit.createLabel( composite, "Add Acl Check:" );
-        addContentAclBooleanWithDefaultWidget = new BooleanWithDefaultWidget();
-        addContentAclBooleanWithDefaultWidget.create( composite, toolkit );
-        addContentAclBooleanWithDefaultWidget.setValue( false );
-        addContentAclBooleanWithDefaultWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-        ControlDecoration addAclContentCheckboxDecoration = new ControlDecoration(
-            addContentAclBooleanWithDefaultWidget.getControl(), SWT.CENTER | SWT.RIGHT );
-        addAclContentCheckboxDecoration.setImage( OpenLdapConfigurationPlugin.getDefault().getImageDescriptor(
-            OpenLdapConfigurationPluginConstants.IMG_INFORMATION ).createImage() );
-        addAclContentCheckboxDecoration.setMarginWidth( 4 );
-        addAclContentCheckboxDecoration.setDescriptionText( "Controls whether Add operations will perform ACL checks on the content of the entry being added" );
-        
         // The olcMonitoring parameter
         toolkit.createLabel( composite, "Monitoring:" );
         monitoringBooleanWithDefaultWidget = new BooleanWithDefaultWidget();
@@ -1131,14 +1119,14 @@ public class DatabasesDetailsPage implem
      * | Requires :                                         |
      * |   +------------------------------------+           |
      * |   |                                    | (Add...)  |
-     * |   |                                    | (Edit...) |
      * |   |                                    | (Delete)  |
+     * |   |                                    |           |
      * |   +------------------------------------+           |
      * | Restrict :                                         |
      * |   +------------------------------------+           |
      * |   |                                    | (Add...)  |
-     * |   |                                    | (Edit...) |
      * |   |                                    | (Delete)  |
+     * |   |                                    |           |
      * |   +------------------------------------+           |
      * | Security Strength Factors :                        |
      * |   +------------------------------------+           |
@@ -1214,6 +1202,64 @@ public class DatabasesDetailsPage implem
 
 
     /**
+     * Creates the Access Settings Section. This will expose the following attributes :
+     *   <ul>
+     *     <li>olcAccess(String, MV, Ordered)</li>
+     *     <li>olcAddContentAcl(Boolean)</li>
+     *   </ul>
+     * 
+     * <pre>
+     * .----------------------------------------------------.
+     * |V XXXX Database access                              |
+     * +----------------------------------------------------+
+     * | Add content ACL : [ ]                              |
+     * | ACLs :                                             |
+     * |   +------------------------------------+           |
+     * |   |                                    | (Add...)  |
+     * |   |                                    | (Edit...) |
+     * |   |                                    | (Delete)  |
+     * |   |                                    | --------  |
+     * |   |                                    | (Up...)   |
+     * |   |                                    | (Down...) |
+     * |   +------------------------------------+           |
+     * +----------------------------------------------------+
+     * </pre>
+     * 
+     * @param parent the parent composite
+     * @param toolkit the toolkit to use
+     */
+    private void createAccessSettingsSection( Composite parent, FormToolkit toolkit )
+    {
+        // Creating the Section
+        Section accessSection = toolkit.createSection( parent, Section.TWISTIE | Section.COMPACT | Section.TITLE_BAR );
+        accessSection.setText( Messages.getString( "OpenLDAPMasterDetail.AccessSettings" ) );
+        accessSection.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+        Composite accessComposite = toolkit.createComposite( accessSection );
+        toolkit.paintBordersFor( accessComposite );
+        GridLayout gl = new GridLayout( 2, true );
+        gl.marginRight = 18;
+        accessComposite.setLayout( gl );
+        accessSection.setClient( accessComposite );
+        
+        // The olcAddContentAcl Button
+        addContentAclCheckbox = BaseWidgetUtils.createCheckbox( accessComposite, "Add Content ACL", 2 );
+        
+        // The olcAccess Table
+        Label aclsLabel = toolkit.createLabel( accessComposite, 
+            Messages.getString( "OpenLDAPMasterDetail.ACLs" ) ); //$NON-NLS-1$
+        aclsLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 4, 1 ) );
+        
+        /*
+        aclsTableWidget = new TableWidget<StringValueWrapper>( 
+            new LimitsDecorator( accessComposite.getShell(), "ACLs" ) );
+
+        aclsTableWidget.createOrderedWidgetWithEdit( accessComposite, toolkit );
+        aclsTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 4, 1 ) );
+        addModifyListener( aclsTableWidget, aclsListener );
+        */
+    }
+    
+    /**
      * Creates the Overlay Settings Section
      *
      * @param parent
@@ -1883,7 +1929,7 @@ public class DatabasesDetailsPage implem
         }
 
         addModifyListener( lastModBooleanWithDefaultWidget, dirtyWidgetModifyListener );
-        addModifyListener( addContentAclBooleanWithDefaultWidget, dirtyWidgetModifyListener );
+        addSelectionListener( addContentAclCheckbox, dirtySelectionListener );
         addModifyListener( monitoringBooleanWithDefaultWidget, dirtyWidgetModifyListener );
         //maxDerefDepthText.addModifyListener( dirtyModifyListener );
 
@@ -1933,7 +1979,7 @@ public class DatabasesDetailsPage implem
         }
 
         removeModifyListener( lastModBooleanWithDefaultWidget, dirtyWidgetModifyListener );
-        removeModifyListener( addContentAclBooleanWithDefaultWidget, dirtyWidgetModifyListener );
+        removeSelectionListener( addContentAclCheckbox, dirtySelectionListener );
         removeModifyListener( monitoringBooleanWithDefaultWidget, dirtyWidgetModifyListener );
         //maxDerefDepthText.removeModifyListener( dirtyModifyListener );
 

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/messages.properties?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/messages.properties (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/messages.properties Thu Aug  6 16:45:20 2015
@@ -21,6 +21,7 @@ OpenLDAPMasterDetail.Title=Overview
 OpenLDAPMasterDetail.GeneralSettings=Database General Settings
 OpenLDAPMasterDetail.LimitsSettings=Database Limits Settings
 OpenLDAPMasterDetail.SecuritySettings=Database Security Settings
+OpenLDAPMasterDetail.AccessSettings=Database Access Settings
 OpenLDAPMasterDetail.SizeLimit=Size Limit :
 OpenLDAPMasterDetail.Edit=Edit...
 OpenLDAPMasterDetail.MaxDerefDepth=Max Dereference depth :
@@ -31,6 +32,7 @@ OpenLDAPMasterDetail.ReadOnly=ReadOnly
 OpenLDAPMasterDetail.RequireCondition=Requires :
 OpenLDAPMasterDetail.RestrictOperation=Restricts :
 OpenLDAPMasterDetail.Security=Secure Strength Factors :
+OpenLDAPMasterDetail.ACLs=ACLs :
 
 #---------------------------------------------------------------------------------------
 # The MDB specific block

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/OverlayDialogConfigurationBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/OverlayDialogConfigurationBlock.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/OverlayDialogConfigurationBlock.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/OverlayDialogConfigurationBlock.java Thu Aug  6 16:45:20 2015
@@ -37,7 +37,7 @@ public interface OverlayDialogConfigurat
      *
      * @param parent the parent composite
      */
-    public void createBlockContent( Composite parent );
+    void createBlockContent( Composite parent );
 
 
     /**
@@ -45,7 +45,7 @@ public interface OverlayDialogConfigurat
      * 
      * @return the dialog
      */
-    public OverlayDialog getDialog();
+    OverlayDialog getDialog();
 
 
     /**
@@ -53,19 +53,19 @@ public interface OverlayDialogConfigurat
      *
      * @return the overlay
      */
-    public Overlay getOverlay();
+    Overlay getOverlay();
 
 
     /**
      * Refreshes the UI based on the input.
      */
-    public void refresh();
+    void refresh();
 
 
     /**
      * Saves the data to the overlay.
      */
-    public void save();
+    void save();
 
 
     /**
@@ -73,7 +73,7 @@ public interface OverlayDialogConfigurat
      * 
      * @param dialog the dialog
      */
-    public void setDialog( OverlayDialog dialog );
+    void setDialog( OverlayDialog dialog );
 
 
     /**
@@ -81,5 +81,5 @@ public interface OverlayDialogConfigurat
      *
      * @param overlay the overlay
      */
-    public void setOverlay( Overlay overlay );
+    void setOverlay( Overlay overlay );
 }

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperViewerSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperViewerSorter.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperViewerSorter.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/ModuleWrapperViewerSorter.java Thu Aug  6 16:45:20 2015
@@ -31,8 +31,7 @@ public class ModuleWrapperViewerSorter e
 {
     public int compare( Viewer viewer, Object e1, Object e2 )
     {
-        if ( ( e1 != null ) && ( e2 != null ) && ( e1 instanceof ModuleWrapper )
-            && ( e2 instanceof ModuleWrapper ) )
+        if ( ( e1 instanceof ModuleWrapper ) && ( e2 instanceof ModuleWrapper ) )
         {
             ModuleWrapper module1 = (ModuleWrapper)e1;
             ModuleWrapper module2 = (ModuleWrapper)e2;

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperViewerSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperViewerSorter.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperViewerSorter.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperViewerSorter.java Thu Aug  6 16:45:20 2015
@@ -33,8 +33,7 @@ public class DatabaseWrapperViewerSorter
 {
     public int compare( Viewer viewer, Object e1, Object e2 )
     {
-        if ( ( e1 != null ) && ( e2 != null ) && ( e1 instanceof DatabaseWrapper )
-            && ( e2 instanceof DatabaseWrapper ) )
+        if ( ( e1 instanceof DatabaseWrapper ) && ( e2 instanceof DatabaseWrapper ) )
         {
             OlcDatabaseConfig database1 = ( ( DatabaseWrapper ) e1 ).getDatabase();
             OlcDatabaseConfig database2 = ( ( DatabaseWrapper ) e2 ).getDatabase();

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/LimitWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/LimitWrapper.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/LimitWrapper.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/LimitWrapper.java Thu Aug  6 16:45:20 2015
@@ -27,13 +27,13 @@ package org.apache.directory.studio.open
 public interface LimitWrapper extends Comparable<LimitWrapper>
 {
     // Define some of the used constants
-    public static final Integer HARD_SOFT = Integer.valueOf( -3 );
-    public static final Integer UNLIMITED = Integer.valueOf( -1 );
+    Integer HARD_SOFT = Integer.valueOf( -3 );
+    Integer UNLIMITED = Integer.valueOf( -1 );
 
-    public static final String HARD_STR = "hard";
-    public static final String NONE_STR = "none";
-    public static final String SOFT_STR = "soft";
-    public static final String UNLIMITED_STR = "unlimited";
+    String HARD_STR = "hard";
+    String NONE_STR = "none";
+    String SOFT_STR = "soft";
+    String UNLIMITED_STR = "unlimited";
 
     
     /**

Modified: directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java (original)
+++ directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java Thu Aug  6 16:45:20 2015
@@ -129,7 +129,6 @@ public class ApplicationActionBarAdvisor
         newAction.setText( Messages.getString( "ApplicationActionBarAdvisor.new" ) ); //$NON-NLS-1$
 
         newDropDownAction = new NewWizardDropDownAction( window );
-        //        new NavigationHistoryAction( window, false );
 
         openFileAction = new OpenFileAction( window );
         register( openFileAction );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProjectsHandlerListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProjectsHandlerListener.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProjectsHandlerListener.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProjectsHandlerListener.java Thu Aug  6 16:45:20 2015
@@ -37,7 +37,7 @@ public interface ProjectsHandlerListener
      * @param project
      *      the added project
      */
-    public void projectAdded( Project project );
+    void projectAdded( Project project );
 
 
     /**
@@ -46,7 +46,7 @@ public interface ProjectsHandlerListener
      * @param project
      *      the removed project
      */
-    public void projectRemoved( Project project );
+    void projectRemoved( Project project );
 
 
     /**
@@ -57,5 +57,5 @@ public interface ProjectsHandlerListener
      * @param newProject
      *      the new opened project
      */
-    public void openProjectChanged( Project oldProject, Project newProject );
+    void openProjectChanged( Project oldProject, Project newProject );
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java Thu Aug  6 16:45:20 2015
@@ -41,7 +41,7 @@ public interface SchemaHandlerListener
      * @param at
      *      the added attribute type
      */
-    public void attributeTypeAdded( AttributeType at );
+    void attributeTypeAdded( AttributeType at );
 
 
     /**
@@ -50,7 +50,7 @@ public interface SchemaHandlerListener
      * @param at
      *      the modified attribute type
      */
-    public void attributeTypeModified( AttributeType at );
+    void attributeTypeModified( AttributeType at );
 
 
     /**
@@ -59,7 +59,7 @@ public interface SchemaHandlerListener
      * @param at
      *      the removed attribute type
      */
-    public void attributeTypeRemoved( AttributeType at );
+    void attributeTypeRemoved( AttributeType at );
 
 
     /**
@@ -68,7 +68,7 @@ public interface SchemaHandlerListener
      * @param mr
      *      the added matching rule
      */
-    public void matchingRuleAdded( MatchingRule mr );
+    void matchingRuleAdded( MatchingRule mr );
 
 
     /**
@@ -77,7 +77,7 @@ public interface SchemaHandlerListener
      * @param mr
      *      the modified matching rule
      */
-    public void matchingRuleModified( MatchingRule mr );
+    void matchingRuleModified( MatchingRule mr );
 
 
     /**
@@ -86,7 +86,7 @@ public interface SchemaHandlerListener
      * @param mr
      *      the removed matching rule
      */
-    public void matchingRuleRemoved( MatchingRule mr );
+    void matchingRuleRemoved( MatchingRule mr );
 
 
     /**
@@ -95,7 +95,7 @@ public interface SchemaHandlerListener
      * @param oc
      *      the added object class
      */
-    public void objectClassAdded( ObjectClass oc );
+    void objectClassAdded( ObjectClass oc );
 
 
     /**
@@ -104,7 +104,7 @@ public interface SchemaHandlerListener
      * @param oc
      *      the modified object class
      */
-    public void objectClassModified( ObjectClass oc );
+    void objectClassModified( ObjectClass oc );
 
 
     /**
@@ -113,7 +113,7 @@ public interface SchemaHandlerListener
      * @param oc
      *      the removed attribute type
      */
-    public void objectClassRemoved( ObjectClass oc );
+    void objectClassRemoved( ObjectClass oc );
 
 
     /**
@@ -122,7 +122,7 @@ public interface SchemaHandlerListener
      * @param schema
      *      the added syntax
      */
-    public void schemaAdded( Schema schema );
+    void schemaAdded( Schema schema );
 
 
     /**
@@ -131,7 +131,7 @@ public interface SchemaHandlerListener
      * @param schema
      *      the removed syntax
      */
-    public void schemaRemoved( Schema schema );
+    void schemaRemoved( Schema schema );
 
 
     /**
@@ -140,7 +140,7 @@ public interface SchemaHandlerListener
      * @param schema
      *      the removed syntax
      */
-    public void schemaRenamed( Schema schema );
+    void schemaRenamed( Schema schema );
 
 
     /**
@@ -149,7 +149,7 @@ public interface SchemaHandlerListener
      * @param syntax
      *      the added syntax
      */
-    public void syntaxAdded( LdapSyntax syntax );
+    void syntaxAdded( LdapSyntax syntax );
 
 
     /**
@@ -158,7 +158,7 @@ public interface SchemaHandlerListener
      * @param syntax
      *      the modified syntax
      */
-    public void syntaxModified( LdapSyntax syntax );
+    void syntaxModified( LdapSyntax syntax );
 
 
     /**
@@ -167,5 +167,5 @@ public interface SchemaHandlerListener
      * @param syntax
      *      the removed syntax
      */
-    public void syntaxRemoved( LdapSyntax syntax );
+    void syntaxRemoved( LdapSyntax syntax );
 }
\ No newline at end of file

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/Difference.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/Difference.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/Difference.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/Difference.java Thu Aug  6 16:45:20 2015
@@ -33,7 +33,7 @@ public interface Difference
      * @return
      *      the source Object
      */
-    public Object getSource();
+    Object getSource();
 
 
     /**
@@ -42,7 +42,7 @@ public interface Difference
      * @param source
      *      the source Object
      */
-    public void setSource( Object source );
+    void setSource( Object source );
 
 
     /**
@@ -51,7 +51,7 @@ public interface Difference
      * @return
      *      the destination Object
      */
-    public Object getDestination();
+    Object getDestination();
 
 
     /**
@@ -60,7 +60,7 @@ public interface Difference
      * @param destination
      *      the destination Object
      */
-    public void setDestination( Object destination );
+    void setDestination( Object destination );
 
 
     /**
@@ -69,7 +69,7 @@ public interface Difference
      * @return
      *      the type
      */
-    public DifferenceType getType();
+    DifferenceType getType();
 
 
     /**
@@ -78,5 +78,5 @@ public interface Difference
      * @param type
      *      the type
      */
-    public void setType( DifferenceType type );
+    void setType( DifferenceType type );
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/PropertyDifference.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/PropertyDifference.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/PropertyDifference.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/PropertyDifference.java Thu Aug  6 16:45:20 2015
@@ -33,7 +33,7 @@ public interface PropertyDifference exte
      * @return
      *      the old value
      */
-    public Object getOldValue();
+    Object getOldValue();
 
 
     /**
@@ -42,7 +42,7 @@ public interface PropertyDifference exte
      * @param oldValue
      *      the old value
      */
-    public void setOldValue( Object oldValue );
+    void setOldValue( Object oldValue );
 
 
     /**
@@ -51,7 +51,7 @@ public interface PropertyDifference exte
      * @return
      *      the new value
      */
-    public Object getNewValue();
+    Object getNewValue();
 
 
     /**
@@ -60,5 +60,5 @@ public interface PropertyDifference exte
      * @param newValue
      *      the new value
      */
-    public void setNewValue( Object newValue );
+    void setNewValue( Object newValue );
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java Thu Aug  6 16:45:20 2015
@@ -122,7 +122,7 @@ public class OpenLdapSchemaFileImporter
      * @return
      *      the name of the file.
      */
-    private static final String getNameFromPath( String path )
+    private static String getNameFromPath( String path )
     {
         File file = new File( path );
         String fileName = file.getName();
@@ -144,7 +144,7 @@ public class OpenLdapSchemaFileImporter
      * @return
      *      the corresponding AttributeTypeImpl
      */
-    private static final AttributeType convertAttributeType( AttributeType at )
+    private static AttributeType convertAttributeType( AttributeType at )
     {
         MutableAttributeType newAT = new MutableAttributeType( at.getOid() );
         newAT.setNames( at.getNames() );
@@ -173,7 +173,7 @@ public class OpenLdapSchemaFileImporter
      * @return
      *      the corresponding ObjectClassImpl
      */
-    private static final MutableObjectClass convertObjectClass( ObjectClass oc )
+    private static MutableObjectClass convertObjectClass( ObjectClass oc )
     {
         MutableObjectClass newOC = new MutableObjectClass( oc.getOid() );
         newOC.setNames( oc.getNames() );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java Thu Aug  6 16:45:20 2015
@@ -44,7 +44,7 @@ public interface SchemaConnector
      *      true if the SchemaConnector is suitable for the given connection,
      *      false if not
      */
-    public boolean isSuitableConnector( Connection connection, StudioProgressMonitor monitor );
+    boolean isSuitableConnector( Connection connection, StudioProgressMonitor monitor );
 
 
     /**
@@ -57,7 +57,7 @@ public interface SchemaConnector
      *      the progress monitor
      * @throws SchemaConnectorException
      */
-    public void importSchema( Project project, StudioProgressMonitor monitor )
+    void importSchema( Project project, StudioProgressMonitor monitor )
         throws SchemaConnectorException;
 
 
@@ -71,7 +71,7 @@ public interface SchemaConnector
      *      the progress monitor
      * @throws SchemaConnectorException
      */
-    public void exportSchema( Project project, StudioProgressMonitor monitor )
+    void exportSchema( Project project, StudioProgressMonitor monitor )
         throws SchemaConnectorException;
 
 
@@ -81,7 +81,7 @@ public interface SchemaConnector
      * @return
      *      the name
      */
-    public String getName();
+    String getName();
 
 
     /**
@@ -90,7 +90,7 @@ public interface SchemaConnector
      * @param name
      *      the name
      */
-    public void setName( String name );
+    void setName( String name );
 
 
     /**
@@ -99,7 +99,7 @@ public interface SchemaConnector
      * @return
      *      the ID
      */
-    public String getId();
+    String getId();
 
 
     /**
@@ -108,7 +108,7 @@ public interface SchemaConnector
      * @param id
      *      the ID
      */
-    public void setId( String id );
+    void setId( String id );
 
 
     /**
@@ -117,7 +117,7 @@ public interface SchemaConnector
      * @return
      *      the description
      */
-    public String getDescription();
+    String getDescription();
 
 
     /**
@@ -126,5 +126,5 @@ public interface SchemaConnector
      * @param description
      *      the description
      */
-    public void setDescription( String description );
+    void setDescription( String description );
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java Thu Aug  6 16:45:20 2015
@@ -258,7 +258,7 @@ public class XMLSchemaFileImporter
      * @return
      *      the name of the file.
      */
-    private static final String getNameFromPath( String path )
+    private static String getNameFromPath( String path )
     {
         File file = new File( path );
         String fileName = file.getName();

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerListener.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerListener.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerListener.java Thu Aug  6 16:45:20 2015
@@ -31,5 +31,5 @@ public interface SchemaCheckerListener
     /**
      * This methods is called when the SchemaChecker is updated.
      */
-    public void schemaCheckerUpdated();
+    void schemaCheckerUpdated();
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaWarning.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaWarning.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaWarning.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaWarning.java Thu Aug  6 16:45:20 2015
@@ -33,8 +33,7 @@ public interface SchemaWarning
     /**
      * Gets the source object.
      * 
-     * @return
-     *      the source object
+     * @return the source object
      */
-    public SchemaObject getSource();
+    SchemaObject getSource();
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/TreeNode.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/TreeNode.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/TreeNode.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/TreeNode.java Thu Aug  6 16:45:20 2015
@@ -37,7 +37,7 @@ public interface TreeNode
      * @return
      *      the children of the element
      */
-    public List<TreeNode> getChildren();
+    List<TreeNode> getChildren();
 
 
     /**
@@ -46,7 +46,7 @@ public interface TreeNode
      * @return
      *      true if the element has children
      */
-    public boolean hasChildren();
+    boolean hasChildren();
 
 
     /**
@@ -55,7 +55,7 @@ public interface TreeNode
      * @return
      *      the parent of the element
      */
-    public TreeNode getParent();
+    TreeNode getParent();
 
 
     /**
@@ -64,7 +64,7 @@ public interface TreeNode
      * @param node
      *      the parent of the element
      */
-    public void setParent( TreeNode parent );
+    void setParent( TreeNode parent );
 
 
     /**
@@ -73,7 +73,7 @@ public interface TreeNode
      * @param node
      *      the node to add
      */
-    public void addChild( TreeNode node );
+    void addChild( TreeNode node );
 
 
     /**
@@ -82,7 +82,7 @@ public interface TreeNode
      * @param node
      *      the node to remove 
      */
-    public void removeChild( TreeNode node );
+    void removeChild( TreeNode node );
 
 
     /**
@@ -95,5 +95,5 @@ public interface TreeNode
      *      
      * @see java.util.List.addAll(Collection c)
      */
-    public boolean addAllChildren( Collection<? extends TreeNode> c );
+    boolean addAllChildren( Collection<? extends TreeNode> c );
 }

Modified: directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/EntryTemplatePluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/EntryTemplatePluginConstants.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/EntryTemplatePluginConstants.java (original)
+++ directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/EntryTemplatePluginConstants.java Thu Aug  6 16:45:20 2015
@@ -28,40 +28,40 @@ package org.apache.directory.studio.temp
 public interface EntryTemplatePluginConstants
 {
     /** The plug-in ID */
-    public static final String PLUGIN_ID = EntryTemplatePlugin.getDefault().getPluginProperties().getString(
+    String PLUGIN_ID = EntryTemplatePlugin.getDefault().getPluginProperties().getString(
         "Plugin_id" ); //$NON-NLS-1$
 
     // Images
-    public static final String IMG_EXPORT_TEMPLATES_WIZARD = "resources/icons/export_templates_wizard.gif"; //$NON-NLS-1$
-    public static final String IMG_FILE = "resources/icons/file.gif"; //$NON-NLS-1$
-    public static final String IMG_IMPORT_TEMPLATES_WIZARD = "resources/icons/import_templates_wizard.gif"; //$NON-NLS-1$
-    public static final String IMG_NO_IMAGE = "resources/icons/no_image.gif"; //$NON-NLS-1$
-    public static final String IMG_OBJECT_CLASS = "resources/icons/object_class.png"; //$NON-NLS-1$
-    public static final String IMG_SWITCH_TEMPLATE = "resources/icons/switch_template.gif"; //$NON-NLS-1$
-    public static final String IMG_TEMPLATE = "resources/icons/template.gif"; //$NON-NLS-1$
-    public static final String IMG_TEMPLATE_DISABLED = "resources/icons/template_disabled.gif"; //$NON-NLS-1$
-    public static final String IMG_TOOLBAR_ADD_VALUE = "resources/icons/toolbar_add_value.gif"; //$NON-NLS-1$
-    public static final String IMG_TOOLBAR_BROWSE_FILE = "resources/icons/toolbar_browse_file.gif"; //$NON-NLS-1$
-    public static final String IMG_TOOLBAR_BROWSE_IMAGE = "resources/icons/toolbar_browse_image.gif"; //$NON-NLS-1$
-    public static final String IMG_TOOLBAR_CLEAR = "resources/icons/toolbar_clear.gif"; //$NON-NLS-1$
-    public static final String IMG_TOOLBAR_DELETE_VALUE = "resources/icons/toolbar_delete_value.gif"; //$NON-NLS-1$
-    public static final String IMG_TOOLBAR_EDIT_PASSWORD = "resources/icons/toolbar_edit_password.gif"; //$NON-NLS-1$
-    public static final String IMG_TOOLBAR_EDIT_DATE = "resources/icons/toolbar_edit_date.gif"; //$NON-NLS-1$
-    public static final String IMG_TOOLBAR_EDIT_VALUE = "resources/icons/toolbar_edit_value.gif"; //$NON-NLS-1$
-    public static final String IMG_TOOLBAR_SAVE_AS = "resources/icons/toolbar_save_as.gif"; //$NON-NLS-1$
+    String IMG_EXPORT_TEMPLATES_WIZARD = "resources/icons/export_templates_wizard.gif"; //$NON-NLS-1$
+    String IMG_FILE = "resources/icons/file.gif"; //$NON-NLS-1$
+    String IMG_IMPORT_TEMPLATES_WIZARD = "resources/icons/import_templates_wizard.gif"; //$NON-NLS-1$
+    String IMG_NO_IMAGE = "resources/icons/no_image.gif"; //$NON-NLS-1$
+    String IMG_OBJECT_CLASS = "resources/icons/object_class.png"; //$NON-NLS-1$
+    String IMG_SWITCH_TEMPLATE = "resources/icons/switch_template.gif"; //$NON-NLS-1$
+    String IMG_TEMPLATE = "resources/icons/template.gif"; //$NON-NLS-1$
+    String IMG_TEMPLATE_DISABLED = "resources/icons/template_disabled.gif"; //$NON-NLS-1$
+    String IMG_TOOLBAR_ADD_VALUE = "resources/icons/toolbar_add_value.gif"; //$NON-NLS-1$
+    String IMG_TOOLBAR_BROWSE_FILE = "resources/icons/toolbar_browse_file.gif"; //$NON-NLS-1$
+    String IMG_TOOLBAR_BROWSE_IMAGE = "resources/icons/toolbar_browse_image.gif"; //$NON-NLS-1$
+    String IMG_TOOLBAR_CLEAR = "resources/icons/toolbar_clear.gif"; //$NON-NLS-1$
+    String IMG_TOOLBAR_DELETE_VALUE = "resources/icons/toolbar_delete_value.gif"; //$NON-NLS-1$
+    String IMG_TOOLBAR_EDIT_PASSWORD = "resources/icons/toolbar_edit_password.gif"; //$NON-NLS-1$
+    String IMG_TOOLBAR_EDIT_DATE = "resources/icons/toolbar_edit_date.gif"; //$NON-NLS-1$
+    String IMG_TOOLBAR_EDIT_VALUE = "resources/icons/toolbar_edit_value.gif"; //$NON-NLS-1$
+    String IMG_TOOLBAR_SAVE_AS = "resources/icons/toolbar_save_as.gif"; //$NON-NLS-1$
 
     // Preferences
-    public static final String PREF_TEMPLATE_ENTRY_EDITOR_PAGE_ID = "org.apache.directory.studio.templateeditor.view.preferences.TemplateEntryEditorPreferencePage"; //$NON-NLS-1$
-    public static final String PREF_TEMPLATES_PRESENTATION = PLUGIN_ID + ".prefs.TemplatesPresentation"; //$NON-NLS-1$
-    public static final int PREF_TEMPLATES_PRESENTATION_TEMPLATE = 1;
-    public static final int PREF_TEMPLATES_PRESENTATION_OBJECT_CLASS = 2;
-    public static final String PREF_DISABLED_TEMPLATES = PLUGIN_ID + ".prefs.DisabledTemplates"; //$NON-NLS-1$
-    public static final String PREF_USE_TEMPLATE_EDITOR_FOR = PLUGIN_ID + ".prefs.UseTemplateEditorFor"; //$NON-NLS-1$
-    public static final int PREF_USE_TEMPLATE_EDITOR_FOR_ANY_ENTRY = 1;
-    public static final int PREF_USE_TEMPLATE_EDITOR_FOR_ENTRIES_WITH_TEMPLATE = 2;
-    public static final String PREF_DEFAULT_TEMPLATES = PLUGIN_ID + ".prefs.DefaultTemplates"; //$NON-NLS-1$
+    String PREF_TEMPLATE_ENTRY_EDITOR_PAGE_ID = "org.apache.directory.studio.templateeditor.view.preferences.TemplateEntryEditorPreferencePage"; //$NON-NLS-1$
+    String PREF_TEMPLATES_PRESENTATION = PLUGIN_ID + ".prefs.TemplatesPresentation"; //$NON-NLS-1$
+    int PREF_TEMPLATES_PRESENTATION_TEMPLATE = 1;
+    int PREF_TEMPLATES_PRESENTATION_OBJECT_CLASS = 2;
+    String PREF_DISABLED_TEMPLATES = PLUGIN_ID + ".prefs.DisabledTemplates"; //$NON-NLS-1$
+    String PREF_USE_TEMPLATE_EDITOR_FOR = PLUGIN_ID + ".prefs.UseTemplateEditorFor"; //$NON-NLS-1$
+    int PREF_USE_TEMPLATE_EDITOR_FOR_ANY_ENTRY = 1;
+    int PREF_USE_TEMPLATE_EDITOR_FOR_ENTRIES_WITH_TEMPLATE = 2;
+    String PREF_DEFAULT_TEMPLATES = PLUGIN_ID + ".prefs.DefaultTemplates"; //$NON-NLS-1$
 
     // Dialogs
-    public static final String DIALOG_IMPORT_TEMPLATES = PLUGIN_ID + ".dialog.ImportTemplates"; //$NON-NLS-1$
-    public static final String DIALOG_EXPORT_TEMPLATES = PLUGIN_ID + ".dialog.ExportTemplates"; //$NON-NLS-1$
+    String DIALOG_IMPORT_TEMPLATES = PLUGIN_ID + ".dialog.ImportTemplates"; //$NON-NLS-1$
+    String DIALOG_EXPORT_TEMPLATES = PLUGIN_ID + ".dialog.ExportTemplates"; //$NON-NLS-1$
 }

Modified: directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/TemplatesManagerListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/TemplatesManagerListener.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/TemplatesManagerListener.java (original)
+++ directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/TemplatesManagerListener.java Thu Aug  6 16:45:20 2015
@@ -37,7 +37,7 @@ public interface TemplatesManagerListene
      * @param template
      *      the added template
      */
-    public void templateAdded( Template template );
+    void templateAdded( Template template );
 
 
     /**
@@ -47,7 +47,7 @@ public interface TemplatesManagerListene
      * @param template
      *      the removed template
      */
-    public void templateRemoved( Template template );
+    void templateRemoved( Template template );
 
 
     /**
@@ -56,7 +56,7 @@ public interface TemplatesManagerListene
      * @param template
      *      the enabled template
      */
-    public void templateEnabled( Template template );
+    void templateEnabled( Template template );
 
 
     /**
@@ -65,5 +65,5 @@ public interface TemplatesManagerListene
      * @param template
      *      the disabled template
      */
-    public void templateDisabled( Template template );
+    void templateDisabled( Template template );
 }

Modified: directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/actions/SwitchTemplateListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/actions/SwitchTemplateListener.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/actions/SwitchTemplateListener.java (original)
+++ directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/actions/SwitchTemplateListener.java Thu Aug  6 16:45:20 2015
@@ -39,5 +39,5 @@ public interface SwitchTemplateListener
      * @param template
      *      the template
      */
-    public void templateSwitched( TemplateEditorWidget templateEditorWidget, Template template );
+    void templateSwitched( TemplateEditorWidget templateEditorWidget, Template template );
 }

Modified: directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/model/AbstractTemplate.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/model/AbstractTemplate.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/model/AbstractTemplate.java (original)
+++ directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/model/AbstractTemplate.java Thu Aug  6 16:45:20 2015
@@ -146,7 +146,7 @@ public abstract class AbstractTemplate i
     /**
      * Initializes the fields of the AbstractTemplate.
      */
-    private final void init()
+    private void init()
     {
         auxiliaryObjectClasses = new ArrayList<String>();
     }

Modified: directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/model/Template.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/model/Template.java?rev=1694538&r1=1694537&r2=1694538&view=diff
==============================================================================
--- directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/model/Template.java (original)
+++ directory/studio/trunk/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/model/Template.java Thu Aug  6 16:45:20 2015
@@ -41,7 +41,7 @@ public interface Template
      *      <code>true</code> if the template did not already contain the 
      *      specified element.
      */
-    public boolean addAuxiliaryObjectClass( String objectClass );
+    boolean addAuxiliaryObjectClass( String objectClass );
 
 
     /**
@@ -50,7 +50,7 @@ public interface Template
      * @return
      *      the auxiliary object classes
      */
-    public List<String> getAuxiliaryObjectClasses();
+    List<String> getAuxiliaryObjectClasses();
 
 
     /**
@@ -59,7 +59,7 @@ public interface Template
      * @return
      *      the form
      */
-    public TemplateForm getForm();
+    TemplateForm getForm();
 
 
     /**
@@ -68,7 +68,7 @@ public interface Template
      * @return
      *      the ID
      */
-    public String getId();
+    String getId();
 
 
     /**
@@ -77,7 +77,7 @@ public interface Template
      * @return
      *      the structural object class
      */
-    public String getStructuralObjectClass();
+    String getStructuralObjectClass();
 
 
     /**
@@ -86,7 +86,7 @@ public interface Template
      * @return
      *      the title
      */
-    public String getTitle();
+    String getTitle();
 
 
     /**
@@ -97,7 +97,7 @@ public interface Template
      * @return
      *      <code>true</code> if the template contained the specified element.
      */
-    public boolean removeAuxiliaryObjectClass( String objectClass );
+    boolean removeAuxiliaryObjectClass( String objectClass );
 
 
     /**
@@ -106,7 +106,7 @@ public interface Template
      * @param objectClasses
      *      the auxiliary object classes
      */
-    public void setAuxiliaryObjectClasses( List<String> objectClasses );
+    void setAuxiliaryObjectClasses( List<String> objectClasses );
 
 
     /**
@@ -115,7 +115,7 @@ public interface Template
      * @param form
      *      the form
      */
-    public void setForm( TemplateForm form );
+    void setForm( TemplateForm form );
 
 
     /**
@@ -124,7 +124,7 @@ public interface Template
      * @param id
      *      the ID
      */
-    public void setId( String id );
+    void setId( String id );
 
 
     /**
@@ -133,7 +133,7 @@ public interface Template
      * @param objectClass
      *      the structural object class
      */
-    public void setStructuralObjectClass( String objectClass );
+    void setStructuralObjectClass( String objectClass );
 
 
     /**
@@ -142,5 +142,5 @@ public interface Template
      * @param title
      *      the title
      */
-    public void setTitle( String title );
+    void setTitle( String title );
 }



Mime
View raw message