You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2007/04/09 21:50:40 UTC
svn commit: r526891 [1/3] - in /directory/ldapstudio/trunk:
ldapstudio-aciitemeditor/ ldapstudio-aciitemeditor/resources/icons/
ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/
ldapstudio-aciitemeditor/src/main/java...
Author: seelmann
Date: Mon Apr 9 12:49:47 2007
New Revision: 526891
URL: http://svn.apache.org/viewvc?view=rev&rev=526891
Log:
Moved source editor configuration into separate package
Moved internal value editors into separate package
Added icons
Some Javadoc, String externalization and code cleaning
Added:
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/resources/icons/attributetypeeditor.png (contents, props changed)
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-valueeditors/resources/icons/attributetypeeditor.png
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/resources/icons/subtreeeditor.png (with props)
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/package-info.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/package-info.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/package-info.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACICodeScanner.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACICodeScanner.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACIContentAssistProcessor.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIContentAssistProcessor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIFormattingStrategy.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACISourceViewerConfiguration.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACISourceViewerConfiguration.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACITextAttributeProvider.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACITextAttributeProvider.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/DialogContentAssistant.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/DialogContentAssistant.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/package-info.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/AttributeTypeAndValueDialog.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/AttributeTypeAndValueDialog.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/AttributeTypeAndValueValueEditor.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/AttributeTypeAndValueValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/AttributeTypeDialog.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/AttributeTypeDialog.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/AttributeTypeValueEditor.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/AttributeTypeValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/ExclusionValueEditor.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ExclusionValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/FilterValueEditor.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/FilterValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/MaxValueCountValueEditor.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/MaxValueCountValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/Messages.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/RestrictedByValueEditor.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/RestrictedByValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/SubtreeValueEditor.java
- copied, changed from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/SubtreeValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/package-info.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/package-info.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/resources/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/resources/org/apache/directory/ldapstudio/aciitemeditor/valueeditors/messages.properties
directory/ldapstudio/trunk/ldapstudio-browser-common/resources/icons/filtereditor.gif (with props)
Removed:
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/AttributeTypeAndValueDialog.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/AttributeTypeAndValueValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/AttributeTypeDialog.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/AttributeTypeValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ExclusionValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/FilterValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/MaxValueCountValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/RestrictedByValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/SubtreeValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/DialogContentAssistant.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/TextDialog.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACICodeScanner.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIContentAssistProcessor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIFormattingStrategy.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACISourceViewerConfiguration.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACITextAttributeProvider.java
directory/ldapstudio/trunk/ldapstudio-valueeditors/resources/icons/attributetypeeditor.png
Modified:
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.xml
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/resources/icons/aciitemeditor.gif (props changed)
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIITemConstants.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIItemValueEditor.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIItemValueWithContext.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/Activator.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/ACIItemDialog.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/ItemPermissionDialog.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/Messages.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/MultiValuedDialog.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/UserPermissionDialog.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/ProtectedItemWrapper.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/ProtectedItemWrapperFactory.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/UserClassWrapper.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/UserClassWrapperFactory.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIItemGeneralComposite.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIItemGrantsAndDenialsComposite.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIItemProtectedItemsComposite.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIItemSourceEditorComposite.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIItemTabFolderComposite.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIItemUserClassesComposite.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIItemVisualEditorComposite.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/Messages.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/WidgetModifyEvent.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/WidgetModifyListener.java
directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/resources/org/apache/directory/ldapstudio/aciitemeditor/dialogs/messages.properties
directory/ldapstudio/trunk/ldapstudio-browser-common/src/main/java/org/apache/directory/ldapstudio/browser/common/BrowserCommonConstants.java
directory/ldapstudio/trunk/ldapstudio-browser-common/src/main/java/org/apache/directory/ldapstudio/browser/common/dialogs/FilterDialog.java
directory/ldapstudio/trunk/ldapstudio-browser-common/src/main/java/org/apache/directory/ldapstudio/browser/common/dialogs/FilterWidgetDialog.java
directory/ldapstudio/trunk/ldapstudio-valueeditors/src/main/java/org/apache/directory/ldapstudio/valueeditors/ValueEditorsConstants.java
directory/ldapstudio/trunk/ldapstudio-valueeditors/src/main/java/org/apache/directory/ldapstudio/valueeditors/integer/IntegerDialog.java
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.xml?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/build.xml Mon Apr 9 12:49:47 2007
@@ -77,13 +77,8 @@
<include name="**" />
</fileset>
</copy>
- <copy todir="${project.build}/icons">
- <fileset dir="${basedir}/icons">
- <include name="**" />
- </fileset>
- </copy>
- <copy todir="${project.build}/templates">
- <fileset dir="${basedir}/templates">
+ <copy todir="${project.build}/resources">
+ <fileset dir="${basedir}/resources">
<include name="**" />
</fileset>
</copy>
Propchange: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/resources/icons/aciitemeditor.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Copied: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/resources/icons/attributetypeeditor.png (from r526712, directory/ldapstudio/trunk/ldapstudio-valueeditors/resources/icons/attributetypeeditor.png)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/resources/icons/attributetypeeditor.png?view=diff&rev=526891&p1=directory/ldapstudio/trunk/ldapstudio-valueeditors/resources/icons/attributetypeeditor.png&r1=526712&p2=directory/ldapstudio/trunk/ldapstudio-aciitemeditor/resources/icons/attributetypeeditor.png&r2=526891
==============================================================================
Binary files - no diff available.
Propchange: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/resources/icons/attributetypeeditor.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/resources/icons/subtreeeditor.png
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/resources/icons/subtreeeditor.png?view=auto&rev=526891
==============================================================================
Binary file - no diff available.
Propchange: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/resources/icons/subtreeeditor.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIITemConstants.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIITemConstants.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIITemConstants.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIITemConstants.java Mon Apr 9 12:49:47 2007
@@ -28,5 +28,5 @@
public interface ACIITemConstants
{
/** The ID for ACI Item Template*/
- public static final String ACI_ITEM_TEMPLATE_ID = "org.apache.directory.ldapstudio.aciitemeditor.templates";
+ public static final String ACI_ITEM_TEMPLATE_ID = "org.apache.directory.ldapstudio.aciitemeditor.templates"; //$NON-NLS-1$
}
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIItemValueEditor.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIItemValueEditor.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIItemValueEditor.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIItemValueEditor.java Mon Apr 9 12:49:47 2007
@@ -95,7 +95,7 @@
{
IEntry entry = attributeHierarchy.getAttribute().getEntry();
IConnection connection = entry.getConnection();
- return new ACIItemValueWithContext( connection, entry, "" );
+ return new ACIItemValueWithContext( connection, entry, "" ); //$NON-NLS-1$
}
else if ( attributeHierarchy.size() == 1 && attributeHierarchy.getAttribute().getValueSize() == 1 )
{
@@ -155,26 +155,26 @@
return null;
}
-
- /**
- * Returns always the string value.
- *
- * Reimplementation, because getRawValue() returns a
- * DnValueEditorRawValueWrapper.
- *
- * @param value the value
- *
- * @return the display value
- */
- public String getDisplayValue( IValue value )
- {
- if ( value == null )
- {
- return "NULL";
- }
-
- String displayValue = value.getStringValue();
- return displayValue;
- }
+//
+// /**
+// * Returns always the string value.
+// *
+// * Reimplementation, because getRawValue() returns a
+// * DnValueEditorRawValueWrapper.
+// *
+// * @param value the value
+// *
+// * @return the display value
+// */
+// public String getDisplayValue( IValue value )
+// {
+// if ( value == null )
+// {
+// return "NULL";
+// }
+//
+// String displayValue = value.getStringValue();
+// return displayValue;
+// }
}
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIItemValueWithContext.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIItemValueWithContext.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIItemValueWithContext.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/ACIItemValueWithContext.java Mon Apr 9 12:49:47 2007
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
package org.apache.directory.ldapstudio.aciitemeditor;
@@ -66,6 +85,15 @@
public IEntry getEntry()
{
return entry;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return aciItemValue == null ? "" : aciItemValue; //$NON-NLS-1$
}
}
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/Activator.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/Activator.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/Activator.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/Activator.java Mon Apr 9 12:49:47 2007
@@ -19,10 +19,11 @@
*/
package org.apache.directory.ldapstudio.aciitemeditor;
+
import java.io.IOException;
-import org.apache.directory.ldapstudio.aciitemeditor.widgets.ACICodeScanner;
-import org.apache.directory.ldapstudio.aciitemeditor.widgets.ACITextAttributeProvider;
+import org.apache.directory.ldapstudio.aciitemeditor.sourceeditor.ACICodeScanner;
+import org.apache.directory.ldapstudio.aciitemeditor.sourceeditor.ACITextAttributeProvider;
import org.apache.directory.shared.ldap.aci.ACIItemParser;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -40,7 +41,6 @@
/**
- *
* The activator class controls the plug-in life cycle
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -63,7 +63,7 @@
/** The shared ACI TextAttribute Provider */
private ACITextAttributeProvider textAttributeProvider;
-
+
/** The template store */
private ContributionTemplateStore aciTemplateStore;
@@ -80,32 +80,31 @@
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ /**
+ * {@inheritDoc}
*/
public void start( BundleContext context ) throws Exception
{
super.start( context );
-
+
// ACI Template ContextType Registry initialization
- if ( this.aciTemplateContextTypeRegistry == null )
+ if ( aciTemplateContextTypeRegistry == null )
{
- this.aciTemplateContextTypeRegistry = new ContributionContextTypeRegistry();
+ aciTemplateContextTypeRegistry = new ContributionContextTypeRegistry();
- this.aciTemplateContextTypeRegistry.addContextType( ACIITemConstants.ACI_ITEM_TEMPLATE_ID );
- this.aciTemplateContextTypeRegistry.getContextType( ACIITemConstants.ACI_ITEM_TEMPLATE_ID )
- .addResolver( new GlobalTemplateVariables.Cursor() );
+ aciTemplateContextTypeRegistry.addContextType( ACIITemConstants.ACI_ITEM_TEMPLATE_ID );
+ aciTemplateContextTypeRegistry.getContextType( ACIITemConstants.ACI_ITEM_TEMPLATE_ID ).addResolver(
+ new GlobalTemplateVariables.Cursor() );
}
-
+
// ACI Template Store initialization
- if ( this.aciTemplateStore == null )
+ if ( aciTemplateStore == null )
{
- this.aciTemplateStore = new ContributionTemplateStore( getAciTemplateContextTypeRegistry(),
- getPreferenceStore(), "templates" );
+ aciTemplateStore = new ContributionTemplateStore( getAciTemplateContextTypeRegistry(),
+ getPreferenceStore(), "templates" ); //$NON-NLS-1$
try
{
- this.aciTemplateStore.load();
+ aciTemplateStore.load();
}
catch ( IOException e )
{
@@ -115,9 +114,8 @@
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ /**
+ * {@inheritDoc}
*/
public void stop( BundleContext context ) throws Exception
{
@@ -208,8 +206,8 @@
int width = Dialog.convertHorizontalDLUsToPixels( fontMetrics, IDialogConstants.BUTTON_WIDTH );
return width;
}
-
-
+
+
/**
* Returns the TextAttribute Provider
*
@@ -225,7 +223,7 @@
return textAttributeProvider;
}
-
+
/**
* Retuns the the Aci Code Scanner
*
@@ -264,5 +262,5 @@
{
return aciTemplateStore;
}
-
+
}
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/ACIItemDialog.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/ACIItemDialog.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/ACIItemDialog.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/ACIItemDialog.java Mon Apr 9 12:49:47 2007
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.ldapstudio.aciitemeditor.dialogs;
@@ -32,8 +31,6 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -52,7 +49,7 @@
/** The context containing the initial value, passed by the constructor */
private ACIItemValueWithContext context;
-
+
/** The resulting value returned by getACIItemValue() */
private String returnValue;
@@ -62,23 +59,21 @@
/**
* Creates a new instance of ACIItemDialog.
- *
+ *
* @param parentShell the shell
- * @param initialValue the initial ACI item to edit, or null to
- * create a new ACI item
+ * @param context the context
*/
public ACIItemDialog( Shell parentShell, ACIItemValueWithContext context )
{
-
super( parentShell );
super.setShellStyle( super.getShellStyle() | SWT.RESIZE );
assert context != null;
assert context.getACIItemValue() != null;
assert context.getConnection() != null;
-
+
this.context = context;
-
+
this.returnValue = null;
}
@@ -104,11 +99,12 @@
protected Control createButtonBar( Composite parent )
{
Composite composite = ( Composite ) super.createButtonBar( parent );
- super.createButton( composite, 987654321, "Format", false );
- super.createButton( composite, 876543210, "Check Syntax", false );
+ super.createButton( composite, 987654321, Messages.getString( "ACIItemDialog.button.format" ), false ); //$NON-NLS-1$
+ super.createButton( composite, 876543210, Messages.getString( "ACIItemDialog.button.checkSyntax" ), false ); //$NON-NLS-1$
return composite;
}
-
+
+
/**
* {@inheritDoc}
*
@@ -125,12 +121,13 @@
try
{
tabFolderComposite.getInput();
- //MessageDialog.openInformation( getShell(), "Check", input ); //$NON-NLS-1$
- MessageDialog.openInformation( getShell(), "Syntax ok", "Syntax ok" ); //$NON-NLS-1$
+ MessageDialog
+ .openInformation(
+ getShell(),
+ Messages.getString( "ACIItemDialog.syntaxOk.title" ), Messages.getString( "ACIItemDialog.syntaxOk.text" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
catch ( ParseException pe )
{
- //MessageDialog.openError( getShell(), "Syntax Error", e1.getMessage() ); //$NON-NLS-1$
IStatus status = new Status( IStatus.ERROR, Activator.PLUGIN_ID, 1, Messages
.getString( "ACIItemDialog.error.invalidSyntax" ), pe ); //$NON-NLS-1$
ErrorDialog.openError( getShell(), Messages.getString( "ACIItemDialog.error.title" ), null, status ); //$NON-NLS-1$
@@ -140,7 +137,8 @@
// call super implementation
super.buttonPressed( buttonId );
}
-
+
+
/**
* Reimplementation: Checks for valid syntax first and sets the return value.
*/
@@ -162,6 +160,10 @@
/**
* Creates the tabFolderComposite.
+ *
+ * @param parent the parent
+ *
+ * @return the control
*/
protected Control createDialogArea( Composite parent )
{
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/ItemPermissionDialog.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/ItemPermissionDialog.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/ItemPermissionDialog.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/ItemPermissionDialog.java Mon Apr 9 12:49:47 2007
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.ldapstudio.aciitemeditor.dialogs;
@@ -53,10 +52,10 @@
*/
public class ItemPermissionDialog extends Dialog
{
-
+
/** The context */
private ACIItemValueWithContext context;
-
+
/** The initial value, passed by the constructor */
private ItemPermission initialItemPermission;
@@ -78,12 +77,13 @@
/**
* Creates a new instance of ItemPermissionDialog.
- *
+ *
* @param parentShell the shell
- * @param initialValue the initial item permission to edit,
- * or null to create a new item permission
+ * @param initialItemPermission the initial item permission
+ * @param context the context
*/
- public ItemPermissionDialog( Shell parentShell, ItemPermission initialItemPermission, ACIItemValueWithContext context )
+ public ItemPermissionDialog( Shell parentShell, ItemPermission initialItemPermission,
+ ACIItemValueWithContext context )
{
super( parentShell );
super.setShellStyle( super.getShellStyle() | SWT.RESIZE );
@@ -101,8 +101,8 @@
protected void configureShell( Shell shell )
{
super.configureShell( shell );
- shell.setText( Messages.getString("ItemPermissionDialog.dialog.text") ); //$NON-NLS-1$
- shell.setImage( Activator.getDefault().getImage( Messages.getString("ItemPermissionDialog.dialog.icon") ) ); //$NON-NLS-1$
+ shell.setText( Messages.getString( "ItemPermissionDialog.dialog.text" ) ); //$NON-NLS-1$
+ shell.setImage( Activator.getDefault().getImage( Messages.getString( "ItemPermissionDialog.dialog.icon" ) ) ); //$NON-NLS-1$
}
@@ -121,13 +121,18 @@
}
catch ( Exception e )
{
- MessageDialog.openError( getShell(), Messages.getString("ItemPermissionDialog.error.invalidItemPermission"), e.getMessage() ); //$NON-NLS-1$
+ MessageDialog.openError( getShell(), Messages
+ .getString( "ItemPermissionDialog.error.invalidItemPermission" ), e.getMessage() ); //$NON-NLS-1$
}
}
/**
* Creates all the dialog content.
+ *
+ * @param parent the parent
+ *
+ * @return the control
*/
protected Control createDialogArea( Composite parent )
{
@@ -142,7 +147,7 @@
spinnerComposite.setLayout( new GridLayout( 2, false ) );
spinnerComposite.setLayoutData( new GridData() );
precedenceCheckbox = new Button( spinnerComposite, SWT.CHECK );
- precedenceCheckbox.setText( Messages.getString("ItemPermissionDialog.precedence.label") ); //$NON-NLS-1$
+ precedenceCheckbox.setText( Messages.getString( "ItemPermissionDialog.precedence.label" ) ); //$NON-NLS-1$
precedenceCheckbox.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/Messages.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/Messages.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/Messages.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/Messages.java Mon Apr 9 12:49:47 2007
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
package org.apache.directory.ldapstudio.aciitemeditor.dialogs;
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/MultiValuedDialog.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/MultiValuedDialog.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/MultiValuedDialog.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/MultiValuedDialog.java Mon Apr 9 12:49:47 2007
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.ldapstudio.aciitemeditor.dialogs;
@@ -25,7 +24,6 @@
import org.apache.directory.ldapstudio.aciitemeditor.ACIItemValueWithContext;
import org.apache.directory.ldapstudio.aciitemeditor.Activator;
-import org.apache.directory.ldapstudio.aciitemeditor.widgets.Messages;
import org.apache.directory.ldapstudio.valueeditors.AbstractDialogStringValueEditor;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -63,13 +61,13 @@
/** The value editor */
private AbstractDialogStringValueEditor valueEditor;
-
+
/** The values, may be empty. */
private List<String> values;
-
+
/** The context */
private ACIItemValueWithContext context;
-
+
/** The inner composite for all the content */
private Composite composite = null;
@@ -91,7 +89,7 @@
/** The delete button */
private Button deleteButton = null;
-
+
/**
* Creates a new instance of MultiValuedDialog.
*
@@ -101,29 +99,35 @@
* @param context the context
* @param valueEditor the detail value editor
*/
- public MultiValuedDialog( Shell parentShell, String displayName, List<String> values, ACIItemValueWithContext context, AbstractDialogStringValueEditor valueEditor )
+ public MultiValuedDialog( Shell parentShell, String displayName, List<String> values,
+ ACIItemValueWithContext context, AbstractDialogStringValueEditor valueEditor )
{
super( parentShell );
super.setShellStyle( super.getShellStyle() | SWT.RESIZE );
-
+
this.displayName = displayName;
this.values = values;
this.context = context;
this.valueEditor = valueEditor;
}
-
+
/**
+ * {@inheritDoc}
+ *
* Sets the dialog title.
*/
protected void configureShell( Shell shell )
{
super.configureShell( shell );
- shell.setText( "Edit " + displayName );
+ shell.setText( Messages.getString("MultiValuedDialog.dialog.titlePrefix") + displayName ); //$NON-NLS-1$
+ shell.setImage( Activator.getDefault().getImage( Messages.getString("MultiValuedDialog.dialog.icon") ) ); //$NON-NLS-1$
}
-
+
/**
+ * {@inheritDoc}
+ *
* Creates only a OK button.
*/
protected void createButtonsForButtonBar( Composite parent )
@@ -132,7 +136,6 @@
}
-
/**
* {@inheritDoc}
*/
@@ -151,12 +154,12 @@
createTable();
createButtonComposite();
-
+
applyDialogFont( composite );
return composite;
}
-
-
+
+
/**
* This method initializes table and table viewer
*/
@@ -193,8 +196,8 @@
}
} );
}
-
-
+
+
/**
* This method initializes buttons
*/
@@ -232,7 +235,7 @@
buttonComposite.setLayout( gridLayout );
addButton = new Button( buttonComposite, SWT.NONE );
- addButton.setText( Messages.getString( "ACIItemUserPermissionsComposite.add.button" ) ); //$NON-NLS-1$
+ addButton.setText( Messages.getString( "MultiValuedDialog.button.add" ) ); //$NON-NLS-1$
addButton.setLayoutData( addButtonGridData );
addButton.addSelectionListener( new SelectionAdapter()
{
@@ -243,7 +246,7 @@
} );
editButton = new Button( buttonComposite, SWT.NONE );
- editButton.setText( Messages.getString( "ACIItemUserPermissionsComposite.edit.button" ) ); //$NON-NLS-1$
+ editButton.setText( Messages.getString( "MultiValuedDialog.button.edit" ) ); //$NON-NLS-1$
editButton.setLayoutData( editButtonGridData );
editButton.addSelectionListener( new SelectionAdapter()
{
@@ -255,7 +258,7 @@
editButton.setEnabled( false );
deleteButton = new Button( buttonComposite, SWT.NONE );
- deleteButton.setText( Messages.getString( "ACIItemUserPermissionsComposite.delete.button" ) ); //$NON-NLS-1$
+ deleteButton.setText( Messages.getString( "MultiValuedDialog.button.delete" ) ); //$NON-NLS-1$
deleteButton.setLayoutData( deleteButtonGridData );
deleteButton.addSelectionListener( new SelectionAdapter()
{
@@ -267,24 +270,24 @@
deleteButton.setEnabled( false );
}
-
-
+
+
/**
* Opens the editor and adds the new value to the list.
*/
private void addValue()
{
- Object oldRawValue = valueEditor.getRawValue( context.getConnection(), "" );
-
+ Object oldRawValue = valueEditor.getRawValue( context.getConnection(), "" ); //$NON-NLS-1$
+
CellEditor cellEditor = valueEditor.getCellEditor();
cellEditor.setValue( oldRawValue );
cellEditor.activate();
Object newRawValue = cellEditor.getValue();
-
- if(newRawValue != null)
+
+ if ( newRawValue != null )
{
- String newValue = (String) valueEditor.getStringOrBinaryValue( newRawValue );
-
+ String newValue = ( String ) valueEditor.getStringOrBinaryValue( newRawValue );
+
values.add( newValue );
tableViewer.refresh();
}
@@ -301,16 +304,16 @@
if ( oldValue != null )
{
Object oldRawValue = valueEditor.getRawValue( context.getConnection(), oldValue );
-
+
CellEditor cellEditor = valueEditor.getCellEditor();
cellEditor.setValue( oldRawValue );
cellEditor.activate();
Object newRawValue = cellEditor.getValue();
-
- if(newRawValue != null)
+
+ if ( newRawValue != null )
{
- String newValue = (String) valueEditor.getStringOrBinaryValue( newRawValue );
-
+ String newValue = ( String ) valueEditor.getStringOrBinaryValue( newRawValue );
+
values.remove( oldValue );
values.add( newValue );
tableViewer.refresh();
@@ -352,8 +355,8 @@
deleteButton.setEnabled( true );
}
}
-
-
+
+
/**
* @return the value that is selected in the table viewer, or null.
*/
@@ -373,5 +376,5 @@
return value;
}
-
+
}
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/UserPermissionDialog.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/UserPermissionDialog.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/UserPermissionDialog.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/UserPermissionDialog.java Mon Apr 9 12:49:47 2007
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.ldapstudio.aciitemeditor.dialogs;
@@ -78,10 +77,10 @@
/**
* Creates a new instance of UserPermissionDialog.
- *
+ *
* @param parentShell the shell
- * @param initialValue the initial user permission to edit,
- * or null to create a new user permission
+ * @param initialUserPermission the initial user permission
+ * @param context the context
*/
public UserPermissionDialog( Shell parentShell, UserPermission initialUserPermission, ACIItemValueWithContext context )
{
@@ -127,7 +126,7 @@
/**
- * Creates all the dialog content.
+ * {@inheritDoc}
*/
protected Control createDialogArea( Composite parent )
{
Added: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/package-info.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/package-info.java?view=auto&rev=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/package-info.java (added)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/dialogs/package-info.java Mon Apr 9 12:49:47 2007
@@ -0,0 +1,4 @@
+/**
+ * Contains the dialogs of the ACI item editor.
+ */
+package org.apache.directory.ldapstudio.aciitemeditor.dialogs;
\ No newline at end of file
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/ProtectedItemWrapper.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/ProtectedItemWrapper.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/ProtectedItemWrapper.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/ProtectedItemWrapper.java Mon Apr 9 12:49:47 2007
@@ -1,6 +1,25 @@
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
package org.apache.directory.ldapstudio.aciitemeditor.model;
+
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collections;
@@ -53,8 +72,7 @@
static
{
Map<Class, String> map = new HashMap<Class, String>();
- map.put( ProtectedItem.Entry.class, Messages
- .getString( "ProtectedItemWrapper.protectedItem.entry.label" ) ); //$NON-NLS-1$
+ map.put( ProtectedItem.Entry.class, Messages.getString( "ProtectedItemWrapper.protectedItem.entry.label" ) ); //$NON-NLS-1$
map.put( ProtectedItem.AllUserAttributeTypes.class, Messages
.getString( "ProtectedItemWrapper.protectedItem.allUserAttributeTypes.label" ) ); //$NON-NLS-1$
map.put( ProtectedItem.AttributeType.class, Messages
@@ -75,11 +93,10 @@
.getString( "ProtectedItemWrapper.protectedItem.maxImmSub.label" ) ); //$NON-NLS-1$
map.put( ProtectedItem.RestrictedBy.class, Messages
.getString( "ProtectedItemWrapper.protectedItem.restrictedBy.label" ) ); //$NON-NLS-1$
- map.put( ProtectedItem.Classes.class, Messages
- .getString( "ProtectedItemWrapper.protectedItem.classes.label" ) ); //$NON-NLS-1$
+ map.put( ProtectedItem.Classes.class, Messages.getString( "ProtectedItemWrapper.protectedItem.classes.label" ) ); //$NON-NLS-1$
classToDisplayMap = Collections.unmodifiableMap( map );
}
-
+
/** A dummy ACI to check syntax of the protectedItemValue */
private static final String DUMMY = "{ identificationTag \"id1\", precedence 1, authenticationLevel simple, " //$NON-NLS-1$
+ "itemOrUserFirst itemFirst: { protectedItems { #identifier# #values# }, " //$NON-NLS-1$
@@ -93,26 +110,28 @@
/** The value prefix, prepended to the value. */
private String valuePrefix;
-
+
/** The value suffix, appended to the value. */
private String valueSuffix;
-
+
/** The value editor, null means no value. */
private AbstractDialogStringValueEditor valueEditor;
-
+
/** The multivalued. */
private boolean isMultivalued;
-
+
/**
* Creates a new instance of ProtectedItemWrapper.
*
* @param clazz the java class of the UserClass
+ * @param isMultivalued the is multivalued
* @param valuePrefix the identifier
* @param valueSuffix the dislpay name
* @param valueEditor the value editor
*/
- public ProtectedItemWrapper( Class clazz, boolean isMultivalued, String valuePrefix, String valueSuffix, AbstractDialogStringValueEditor valueEditor )
+ public ProtectedItemWrapper( Class clazz, boolean isMultivalued, String valuePrefix, String valueSuffix,
+ AbstractDialogStringValueEditor valueEditor )
{
this.clazz = clazz;
this.isMultivalued = isMultivalued;
@@ -122,8 +141,8 @@
this.values = new ArrayList<String>();
}
-
-
+
+
/**
* Creates a new protected item object. Therefore it uses the
* dummy ACI, injects the protected item and its value, parses
@@ -156,8 +175,8 @@
ProtectedItem item = ( ProtectedItem ) aci.getProtectedItems().iterator().next();
return item;
}
-
-
+
+
/**
* Sets the protected item.
*
@@ -196,7 +215,7 @@
Attribute attribute = ( Attribute ) it.next();
try
{
- values.add( attribute.getID() + "=" + attribute.get() );
+ values.add( attribute.getID() + "=" + attribute.get() ); //$NON-NLS-1$
}
catch ( NamingException e )
{
@@ -254,8 +273,8 @@
}
}
-
-
+
+
/**
* Returns a user-friedly string, displayed in the table.
*
@@ -280,8 +299,8 @@
return getDisplayName() + " " + flatValue; //$NON-NLS-1$
}
-
-
+
+
/**
* Returns the flat value.
*
@@ -295,7 +314,7 @@
}
StringBuffer sb = new StringBuffer();
- if(isMultivalued())
+ if ( isMultivalued() )
{
sb.append( "{ " ); //$NON-NLS-1$
}
@@ -310,14 +329,14 @@
sb.append( ", " ); //$NON-NLS-1$
}
}
- if(isMultivalued())
+ if ( isMultivalued() )
{
sb.append( " }" ); //$NON-NLS-1$
}
return sb.toString();
}
-
-
+
+
/**
* Returns the list of values, may be modified.
*
@@ -327,8 +346,8 @@
{
return values;
}
-
-
+
+
/**
* Gets the display name.
*
@@ -340,7 +359,6 @@
}
-
/**
* Gets the identifier.
*
@@ -352,7 +370,6 @@
}
-
/**
* Returns the class of the user class.
*
@@ -363,7 +380,7 @@
return clazz;
}
-
+
/**
* Checks if is editable.
*
@@ -373,7 +390,6 @@
{
return valueEditor != null;
}
-
/**
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/ProtectedItemWrapperFactory.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/ProtectedItemWrapperFactory.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/ProtectedItemWrapperFactory.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/ProtectedItemWrapperFactory.java Mon Apr 9 12:49:47 2007
@@ -1,145 +1,118 @@
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
package org.apache.directory.ldapstudio.aciitemeditor.model;
-import org.apache.directory.ldapstudio.aciitemeditor.AttributeTypeAndValueValueEditor;
-import org.apache.directory.ldapstudio.aciitemeditor.AttributeTypeValueEditor;
-import org.apache.directory.ldapstudio.aciitemeditor.FilterValueEditor;
-import org.apache.directory.ldapstudio.aciitemeditor.MaxValueCountValueEditor;
-import org.apache.directory.ldapstudio.aciitemeditor.RestrictedByValueEditor;
+
+import org.apache.directory.ldapstudio.aciitemeditor.valueeditors.AttributeTypeAndValueValueEditor;
+import org.apache.directory.ldapstudio.aciitemeditor.valueeditors.AttributeTypeValueEditor;
+import org.apache.directory.ldapstudio.aciitemeditor.valueeditors.FilterValueEditor;
+import org.apache.directory.ldapstudio.aciitemeditor.valueeditors.MaxValueCountValueEditor;
+import org.apache.directory.ldapstudio.aciitemeditor.valueeditors.RestrictedByValueEditor;
import org.apache.directory.ldapstudio.valueeditors.TextValueEditor;
import org.apache.directory.ldapstudio.valueeditors.integer.IntegerValueEditor;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
+
+/**
+ * The ProtectedItemWrapperFactory creates the ProtectedItemWrappers, ready to
+ * be used in the protected item table.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
public class ProtectedItemWrapperFactory
{
-
+
+ /**
+ * Creates the protected item wrappers.
+ *
+ * @return the protected item wrapper[]
+ */
public static final ProtectedItemWrapper[] createProtectedItemWrappers()
{
ProtectedItemWrapper[] protectedItemWrappers = new ProtectedItemWrapper[]
- {
+ {
// entry
- new ProtectedItemWrapper
- (
- ProtectedItem.Entry.class,
- false,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.Entry.class, false, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- null
- ),
-
+ null ),
+
// allUserAttributeTypes
- new ProtectedItemWrapper
- (
- ProtectedItem.AllUserAttributeTypes.class,
- false,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.AllUserAttributeTypes.class, false, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- null
- ),
-
+ null ),
+
// attributeType { 1.2.3, cn }
- new ProtectedItemWrapper
- (
- ProtectedItem.AttributeType.class,
- true,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.AttributeType.class, true, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- new AttributeTypeValueEditor()
- ),
-
+ new AttributeTypeValueEditor() ),
+
// allAttributeValues { 1.2.3, cn }
- new ProtectedItemWrapper
- (
- ProtectedItem.AllAttributeValues.class,
- true,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.AllAttributeValues.class, true, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- new AttributeTypeValueEditor()
- ),
-
+ new AttributeTypeValueEditor() ),
+
// attributeType
- new ProtectedItemWrapper
- (
- ProtectedItem.AllUserAttributeTypesAndValues.class,
- false,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.AllUserAttributeTypesAndValues.class, false, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- null
- ),
-
+ null ),
+
// attributeValue { ou=people, cn=Ersin }
- new ProtectedItemWrapper
- (
- ProtectedItem.AttributeValue.class,
- true,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.AttributeValue.class, true, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- new AttributeTypeAndValueValueEditor()
- ),
-
+ new AttributeTypeAndValueValueEditor() ),
+
// selfValue { 1.2.3, cn }
- new ProtectedItemWrapper
- (
- ProtectedItem.SelfValue.class,
- true,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.SelfValue.class, true, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- new AttributeTypeValueEditor()
- ),
-
+ new AttributeTypeValueEditor() ),
+
// rangeOfValues (cn=E*)
- new ProtectedItemWrapper
- (
- ProtectedItem.RangeOfValues.class,
- false,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.RangeOfValues.class, false, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- new FilterValueEditor()
- ),
-
+ new FilterValueEditor() ),
+
// maxValueCount { { type 10.11.12, maxCount 10 }, { maxCount 20, type 11.12.13 } }
- new ProtectedItemWrapper
- (
- ProtectedItem.MaxValueCount.class,
- true,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.MaxValueCount.class, true, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- new MaxValueCountValueEditor()
- ),
-
+ new MaxValueCountValueEditor() ),
+
// maxImmSub 3
- new ProtectedItemWrapper
- (
- ProtectedItem.MaxImmSub.class,
- false,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.MaxImmSub.class, false, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- new IntegerValueEditor()
- ),
-
+ new IntegerValueEditor() ),
+
// restrictedBy { { type 10.11.12, valuesIn ou }, { valuesIn cn, type 11.12.13 } }
- new ProtectedItemWrapper
- (
- ProtectedItem.RestrictedBy.class,
- true,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.RestrictedBy.class, true, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- new RestrictedByValueEditor()
- ),
-
+ new RestrictedByValueEditor() ),
+
// classes and : { item: xyz , or:{item:X,item:Y} }
- new ProtectedItemWrapper
- (
- ProtectedItem.Classes.class,
- false,
- "", //$NON-NLS-1$
+ new ProtectedItemWrapper( ProtectedItem.Classes.class, false, "", //$NON-NLS-1$
"", //$NON-NLS-1$
new TextValueEditor() // TODO: RefinementValueEditor
),
-
+
};
-
+
return protectedItemWrappers;
}
-
+
}
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/UserClassWrapper.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/UserClassWrapper.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/UserClassWrapper.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/UserClassWrapper.java Mon Apr 9 12:49:47 2007
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
package org.apache.directory.ldapstudio.aciitemeditor.model;
Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/UserClassWrapperFactory.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/UserClassWrapperFactory.java?view=diff&rev=526891&r1=526890&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/UserClassWrapperFactory.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/UserClassWrapperFactory.java Mon Apr 9 12:49:47 2007
@@ -1,67 +1,76 @@
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
package org.apache.directory.ldapstudio.aciitemeditor.model;
-import org.apache.directory.ldapstudio.aciitemeditor.SubtreeValueEditor;
-import org.apache.directory.ldapstudio.valueeditors.TextValueEditor;
+
+import org.apache.directory.ldapstudio.aciitemeditor.valueeditors.SubtreeValueEditor;
import org.apache.directory.ldapstudio.valueeditors.dn.DnValueEditor;
import org.apache.directory.shared.ldap.aci.UserClass;
+
+/**
+ * The UserClassWrapperFactory creates the UserClassWrapper, ready to
+ * be used in the user classes table.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
public class UserClassWrapperFactory
{
-
-
+
+ /**
+ * Creates the user class wrappers.
+ *
+ * @return the user class wrapper[]
+ */
public static final UserClassWrapper[] createUserClassWrappers()
{
UserClassWrapper[] userClassWrappers = new UserClassWrapper[]
- {
+ {
// allUsers
- new UserClassWrapper
- (
- UserClass.AllUsers.class,
- "", //$NON-NLS-1$
+ new UserClassWrapper( UserClass.AllUsers.class, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- null
- ),
-
+ null ),
+
// thisEntry
- new UserClassWrapper
- (
- UserClass.ThisEntry.class,
- "", //$NON-NLS-1$
+ new UserClassWrapper( UserClass.ThisEntry.class, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- null
- ),
-
+ null ),
+
// name
- new UserClassWrapper
- (
- UserClass.Name.class,
- "\"", //$NON-NLS-1$
+ new UserClassWrapper( UserClass.Name.class, "\"", //$NON-NLS-1$
"\"", //$NON-NLS-1$
- new DnValueEditor()
- ),
-
+ new DnValueEditor() ),
+
// userGroup
- new UserClassWrapper
- (
- UserClass.UserGroup.class,
- "\"", //$NON-NLS-1$
+ new UserClassWrapper( UserClass.UserGroup.class, "\"", //$NON-NLS-1$
"\"", //$NON-NLS-1$
- new DnValueEditor()
- ),
-
+ new DnValueEditor() ),
+
// subtree
- new UserClassWrapper
- (
- UserClass.Subtree.class,
- "", //$NON-NLS-1$
+ new UserClassWrapper( UserClass.Subtree.class, "", //$NON-NLS-1$
"", //$NON-NLS-1$
- new SubtreeValueEditor() // TODO: SubtreeValueEditor
- )
- };
-
+ new SubtreeValueEditor()
+ ) };
+
return userClassWrappers;
}
-
-
+
}
Added: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/package-info.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/package-info.java?view=auto&rev=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/package-info.java (added)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/model/package-info.java Mon Apr 9 12:49:47 2007
@@ -0,0 +1,4 @@
+/**
+ * Contains the model for the ACI item editor.
+ */
+package org.apache.directory.ldapstudio.aciitemeditor.model;
\ No newline at end of file
Added: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/package-info.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/package-info.java?view=auto&rev=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/package-info.java (added)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/package-info.java Mon Apr 9 12:49:47 2007
@@ -0,0 +1,6 @@
+/**
+ * Contains the ACI item editor's
+ * {@link org.apache.directory.ldapstudio.valueeditors.IValueEditor}
+ * implementation and the plugin activator.
+ */
+package org.apache.directory.ldapstudio.aciitemeditor;
\ No newline at end of file
Copied: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACICodeScanner.java (from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACICodeScanner.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACICodeScanner.java?view=diff&rev=526891&p1=directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACICodeScanner.java&r1=526712&p2=directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACICodeScanner.java&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACICodeScanner.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACICodeScanner.java Mon Apr 9 12:49:47 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.ldapstudio.aciitemeditor.widgets;
+package org.apache.directory.ldapstudio.aciitemeditor.sourceeditor;
import java.util.ArrayList;
@@ -43,38 +43,81 @@
public class ACICodeScanner extends RuleBasedScanner
{
/** 'identificationTag' keyword */
- public static final String identificationTagPartition = "identificationTag";
+ public static final String identificationTagPartition = "identificationTag"; //$NON-NLS-1$
/** 'precedence' keyword */
- public static final String precedencePartition = "precedence";
+ public static final String precedencePartition = "precedence"; //$NON-NLS-1$
/** 'authenticationLevel' keyword */
- public static final String authenticationLevelPartition = "authenticationLevel";
+ public static final String authenticationLevelPartition = "authenticationLevel"; //$NON-NLS-1$
/** Keywords for the itemOrUserFirst Section */
public static final String[] itemOrUserFirstSectionPartition = new String[]
- { "itemOrUserFirst", "itemFirst", "userFirst" };
+ { "itemOrUserFirst", "itemFirst", "userFirst" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
/** Keywords for 'userFirst' section */
public static final String[] userSection = new String[]
- { "userClasses", "userPermissions" };
+ { "userClasses", "userPermissions" }; //$NON-NLS-1$ //$NON-NLS-2$
/** Keywords for AciItems values */
public static final String[] aciKeywords = new String[]
- { "protectedItems", "itemPermissions", "entry", "allUserAttributeTypes", "attributeType",
- "allAttributeValues", "allUserAttributeTypesAndValues", "attributeValue", "selfValue", "rangeOfValues",
- "maxValueCount", "maxImmSub", "restrictedBy", "classes", "grantsAndDenials", "allUsers", "thisEntry",
- "name", "userGroup", "subtree", "type", "valuesIn", "none", "simple", "strong" };
+ { "protectedItems", //$NON-NLS-1$
+ "itemPermissions", //$NON-NLS-1$
+ "entry", //$NON-NLS-1$
+ "allUserAttributeTypes", //$NON-NLS-1$
+ "attributeType", //$NON-NLS-1$
+ "allAttributeValues", //$NON-NLS-1$
+ "allUserAttributeTypesAndValues", //$NON-NLS-1$
+ "attributeValue", //$NON-NLS-1$
+ "selfValue", //$NON-NLS-1$
+ "rangeOfValues", //$NON-NLS-1$
+ "maxValueCount", //$NON-NLS-1$
+ "maxImmSub", //$NON-NLS-1$
+ "restrictedBy", //$NON-NLS-1$
+ "classes", //$NON-NLS-1$
+ "grantsAndDenials", //$NON-NLS-1$
+ "allUsers", //$NON-NLS-1$
+ "thisEntry", //$NON-NLS-1$
+ "name", //$NON-NLS-1$
+ "userGroup", //$NON-NLS-1$
+ "subtree", //$NON-NLS-1$
+ "type", //$NON-NLS-1$
+ "valuesIn", //$NON-NLS-1$
+ "none", //$NON-NLS-1$
+ "simple", //$NON-NLS-1$
+ "strong" }; //$NON-NLS-1$
/** Keywords for grant values */
public static final String[] aciGrantValues = new String[]
- { "grantAdd", "grantDiscloseOnError", "grantRead", "grantRemove", "grantBrowse", "grantExport", "grantImport",
- "grantModify", "grantRename", "grantReturnDN", "grantCompare", "grantFilterMatch", "grantInvoke", };
+ { "grantAdd", //$NON-NLS-1$
+ "grantDiscloseOnError", //$NON-NLS-1$
+ "grantRead", //$NON-NLS-1$
+ "grantRemove", //$NON-NLS-1$
+ "grantBrowse", //$NON-NLS-1$
+ "grantExport", //$NON-NLS-1$
+ "grantImport", //$NON-NLS-1$
+ "grantModify", //$NON-NLS-1$
+ "grantRename", //$NON-NLS-1$
+ "grantReturnDN", //$NON-NLS-1$
+ "grantCompare", //$NON-NLS-1$
+ "grantFilterMatch", //$NON-NLS-1$
+ "grantInvoke", }; //$NON-NLS-1$
/** Keywords for deny values */
public static final String[] aciDenyValues = new String[]
- { "denyAdd", "denyDiscloseOnError", "denyRead", "denyRemove", "denyBrowse", "denyExport", "denyImport",
- "denyModify", "denyRename", "denyReturnDN", "denyCompare", "denyFilterMatch", "denyInvoke" };
+ { "denyAdd", //$NON-NLS-1$
+ "denyDiscloseOnError", //$NON-NLS-1$
+ "denyRead", //$NON-NLS-1$
+ "denyRemove", //$NON-NLS-1$
+ "denyBrowse", //$NON-NLS-1$
+ "denyExport", //$NON-NLS-1$
+ "denyImport", //$NON-NLS-1$
+ "denyModify", //$NON-NLS-1$
+ "denyRename", //$NON-NLS-1$
+ "denyReturnDN", //$NON-NLS-1$
+ "denyCompare", //$NON-NLS-1$
+ "denyFilterMatch", //$NON-NLS-1$
+ "denyInvoke" }; //$NON-NLS-1$
/**
@@ -100,8 +143,8 @@
IToken user = new Token( provider.getAttribute( ACITextAttributeProvider.USER_ATTRIBUTE ) );
// Rules for Strings
- rules.add( new SingleLineRule( "\"", "\"", string, '\0', true ) );
- rules.add( new SingleLineRule( "'", "'", string, '\0', true ) );
+ rules.add( new SingleLineRule( "\"", "\"", string, '\0', true ) ); //$NON-NLS-1$ //$NON-NLS-2$
+ rules.add( new SingleLineRule( "'", "'", string, '\0', true ) ); //$NON-NLS-1$ //$NON-NLS-2$
// Generic rule for whitespaces
rules.add( new WhitespaceRule( new IWhitespaceDetector()
{
@@ -172,8 +215,8 @@
*/
static class AciWordDetector implements IWordDetector
{
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.rules.IWordDetector#isWordPart(char)
+ /**
+ * {@inheritDoc}
*/
public boolean isWordPart( char c )
{
@@ -182,8 +225,8 @@
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.rules.IWordDetector#isWordStart(char)
+ /**
+ * {@inheritDoc}
*/
public boolean isWordStart( char c )
{
Copied: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACIContentAssistProcessor.java (from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIContentAssistProcessor.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACIContentAssistProcessor.java?view=diff&rev=526891&p1=directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIContentAssistProcessor.java&r1=526712&p2=directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACIContentAssistProcessor.java&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIContentAssistProcessor.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACIContentAssistProcessor.java Mon Apr 9 12:49:47 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.ldapstudio.aciitemeditor.widgets;
+package org.apache.directory.ldapstudio.aciitemeditor.sourceeditor;
import java.util.ArrayList;
Copied: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java (from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIFormattingStrategy.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java?view=diff&rev=526891&p1=directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIFormattingStrategy.java&r1=526712&p2=directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACIFormattingStrategy.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java Mon Apr 9 12:49:47 2007
@@ -1,5 +1,23 @@
-
-package org.apache.directory.ldapstudio.aciitemeditor.widgets;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.ldapstudio.aciitemeditor.sourceeditor;
import org.apache.directory.ldapstudio.browser.core.BrowserCoreConstants;
import org.eclipse.jface.text.formatter.IFormattingStrategy;
@@ -19,7 +37,7 @@
{
/** The Constant INDENT_STRING. */
- public static final String INDENT_STRING = " ";
+ public static final String INDENT_STRING = " "; //$NON-NLS-1$
/** The Constant NEWLINE. */
public static final String NEWLINE = BrowserCoreConstants.LINE_SEPARATOR;
Copied: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACISourceViewerConfiguration.java (from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACISourceViewerConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACISourceViewerConfiguration.java?view=diff&rev=526891&p1=directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACISourceViewerConfiguration.java&r1=526712&p2=directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACISourceViewerConfiguration.java&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACISourceViewerConfiguration.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACISourceViewerConfiguration.java Mon Apr 9 12:49:47 2007
@@ -17,11 +17,10 @@
* under the License.
*
*/
-package org.apache.directory.ldapstudio.aciitemeditor.widgets;
+package org.apache.directory.ldapstudio.aciitemeditor.sourceeditor;
import org.apache.directory.ldapstudio.aciitemeditor.Activator;
-import org.apache.directory.ldapstudio.aciitemeditor.dialogs.DialogContentAssistant;
import org.eclipse.jface.text.IAutoEditStrategy;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.contentassist.ContentAssistant;
@@ -72,7 +71,7 @@
IContentAssistProcessor aciContentAssistProcessor = new ACIContentAssistProcessor();
assistant.setContentAssistProcessor( aciContentAssistProcessor, IDocument.DEFAULT_CONTENT_TYPE );
- assistant.setDocumentPartitioning( "org.apache.directory.ldapstudio.aci" );
+ assistant.setDocumentPartitioning( "org.apache.directory.ldapstudio.aci" ); //$NON-NLS-1$
assistant.enableAutoActivation( true );
assistant.setAutoActivationDelay( 500 );
assistant.setProposalPopupOrientation( IContentAssistant.PROPOSAL_STACKED );
@@ -81,7 +80,9 @@
return assistant;
}
- @Override
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentFormatter(org.eclipse.jface.text.source.ISourceViewer)
+ */
public IContentFormatter getContentFormatter( ISourceViewer sourceViewer )
{
ContentFormatter formatter = new ContentFormatter();
@@ -91,10 +92,4 @@
return formatter;
}
- @Override
- public IAutoEditStrategy[] getAutoEditStrategies( ISourceViewer sourceViewer, String contentType )
- {
- // TODO Auto-generated method stub
- return super.getAutoEditStrategies( sourceViewer, contentType );
- }
}
Copied: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACITextAttributeProvider.java (from r526712, directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACITextAttributeProvider.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACITextAttributeProvider.java?view=diff&rev=526891&p1=directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACITextAttributeProvider.java&r1=526712&p2=directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACITextAttributeProvider.java&r2=526891
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/widgets/ACITextAttributeProvider.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/sourceeditor/ACITextAttributeProvider.java Mon Apr 9 12:49:47 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.ldapstudio.aciitemeditor.widgets;
+package org.apache.directory.ldapstudio.aciitemeditor.sourceeditor;
import java.util.HashMap;
@@ -38,18 +38,18 @@
*/
public class ACITextAttributeProvider
{
- public static final String DEFAULT_ATTRIBUTE = "__pos_aci_default_attribute";
- public static final String KEYWORD_ATTRIBUTE = "__pos_aci_keyword_attribute";
- public static final String STRING_ATTRIBUTE = "__pos_aci_string_attribute";
- public static final String GRANT_DENY_ATTRIBUTE = "__pos_aci_grant_deny_attribute";
- public static final String IDENTIFICATION_ATTRIBUTE = "__pos_aci_identification_attribute";
- public static final String PRECEDENCE_ATTRIBUTE = "__pos_aci_precedence_attribute";
- public static final String AUTHENTICATIONLEVEL_ATTRIBUTE = "__pos_aci_authenticationlevel_attribute";
- public static final String ITEMORUSERFIRST_ATTRIBUTE = "__pos_aci_itemoruserfirst_attribute";
- public static final String USER_ATTRIBUTE = "__pos_aci_user_attribute";
+ public static final String DEFAULT_ATTRIBUTE = "__pos_aci_default_attribute"; //$NON-NLS-1$
+ public static final String KEYWORD_ATTRIBUTE = "__pos_aci_keyword_attribute"; //$NON-NLS-1$
+ public static final String STRING_ATTRIBUTE = "__pos_aci_string_attribute"; //$NON-NLS-1$
+ public static final String GRANT_DENY_ATTRIBUTE = "__pos_aci_grant_deny_attribute"; //$NON-NLS-1$
+ public static final String IDENTIFICATION_ATTRIBUTE = "__pos_aci_identification_attribute"; //$NON-NLS-1$
+ public static final String PRECEDENCE_ATTRIBUTE = "__pos_aci_precedence_attribute"; //$NON-NLS-1$
+ public static final String AUTHENTICATIONLEVEL_ATTRIBUTE = "__pos_aci_authenticationlevel_attribute"; //$NON-NLS-1$
+ public static final String ITEMORUSERFIRST_ATTRIBUTE = "__pos_aci_itemoruserfirst_attribute"; //$NON-NLS-1$
+ public static final String USER_ATTRIBUTE = "__pos_aci_user_attribute"; //$NON-NLS-1$
- public static final String GRANT_VALUE = "__pos_aci_grant_value";
- public static final String DENY_VALUE = "__pos_aci_deny_value";
+ public static final String GRANT_VALUE = "__pos_aci_grant_value"; //$NON-NLS-1$
+ public static final String DENY_VALUE = "__pos_aci_deny_value"; //$NON-NLS-1$
private Map<String, TextAttribute> attributes = new HashMap<String, TextAttribute>();