directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r742161 - in /directory/studio/trunk: ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/ ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/ ldapbrowser-...
Date Sun, 08 Feb 2009 20:42:08 GMT
Author: seelmann
Date: Sun Feb  8 20:42:07 2009
New Revision: 742161

URL: http://svn.apache.org/viewvc?rev=742161&view=rev
Log:
DIRSTUDIO-234: Moved checks, added check for allowed attribute

Modified:
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/NewValueAction.java
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_de.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/messages.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/messages_de.properties
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Subschema.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/NewValueAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/NewValueAction.java?rev=742161&r1=742160&r2=742161&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/NewValueAction.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/NewValueAction.java
Sun Feb  8 20:42:07 2009
@@ -23,12 +23,8 @@
 
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
-import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
 import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
-import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osgi.util.NLS;
 
 
 /**
@@ -76,33 +72,7 @@
             attribute = getSelectedAttributeHierarchies()[0].getAttribute();
         }
 
-        // validate non-modifiable and single-valued attributes
-        StringBuffer message = new StringBuffer();
-        if ( !SchemaUtils.isModifiable( attribute.getAttributeTypeDescription() ) )
-        {
-            message.append( NLS.bind( Messages.getString( "NewValueAction.NewValueNotModifiable"
), attribute //$NON-NLS-1$
-                .getDescription() ) );
-            message.append( BrowserCoreConstants.LINE_SEPARATOR );
-            message.append( BrowserCoreConstants.LINE_SEPARATOR );
-        }
-        if ( attribute.getAttributeTypeDescription().isSingleValued() )
-        {
-            message.append( NLS.bind( Messages.getString( "NewValueAction.NewValueSingleValued"
), attribute //$NON-NLS-1$
-                .getDescription() ) );
-            message.append( BrowserCoreConstants.LINE_SEPARATOR );
-            message.append( BrowserCoreConstants.LINE_SEPARATOR );
-        }
-
-        boolean ok = true;
-        if ( message.length() > 0 )
-        {
-            message.append( Messages.getString( "NewValueAction.NewValueQuestion" ) ); //$NON-NLS-1$
-            ok = MessageDialog.openConfirm( getShell(), getText(), message.toString() );
-        }
-        if ( ok )
-        {
-            attribute.addEmptyValue();
-        }
+        attribute.addEmptyValue();
     }
 
 

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages.properties?rev=742161&r1=742160&r2=742161&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages.properties
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages.properties
Sun Feb  8 20:42:07 2009
@@ -59,9 +59,6 @@
 NewAttributeAction.NewAttribute=New Attribute
 NewAttributeAction.NewAttributeLabel=New Attribute...
 NewValueAction.NewValue=New Value
-NewValueAction.NewValueNotModifiable=Warning\! According to the schema attribute {0} is not
modifiable\!
-NewValueAction.NewValueQuestion=Do you still want to add a new value?
-NewValueAction.NewValueSingleValued=Warning\! According to the schema attribute {0} is single-valued\!
 PasteAction.Paste=Paste
 PasteAction.PasteEntries=Paste Entries
 PasteAction.PasteEntry=Paste Entry

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_de.properties?rev=742161&r1=742160&r2=742161&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_de.properties
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/messages_de.properties
Sun Feb  8 20:42:07 2009
@@ -33,9 +33,9 @@
 DeleteAction.DeleteEntriesQuestion=Sind Sie sicher die folgenden Einträge zu löschen, inklusive
aller Kind-Einträge?
 DeleteAction.DeleteEntry=Eintrag löschen
 DeleteAction.DeleteEntryQuestion=Sind Sie sicher den folgenden Eintrag zu löschen, inklusive
aller Kind-Einträge?
-DeleteAction.DeleteMust=Warnung\! Gemäß dem Schema ist das Attribut {0} ein Pflichtattribut\!
+DeleteAction.DeleteMust=Warnung\! Gemäß Schema ist das Attribut {0} ein Pflichtattribut\!
 DeleteAction.DeleteNeededObjectClass=Warnung\! Keine der verbleibenden Objektklassen erlaubt
das Attribut {0}\!
-DeleteAction.DeleteNonModifiable=Warnung\! Gemäß dem Schema ist das Attribut {0} nicht
änderbar\!
+DeleteAction.DeleteNonModifiable=Warnung\! Gemäß Schema ist das Attribut {0} nicht änderbar\!
 DeleteAction.DeleteObjectClass=Warnung\! Sie sind dabei das Attribut objectClass zu löschen\!
 DeleteAction.DeletePartOfRDN=Warnung\! Das Attribut {0} ist Teil des RDN\!
 DeleteAction.DeleteRootDSE=Warnung\! Sie sind dabei die Root DSE zu löschen\!
@@ -59,9 +59,6 @@
 NewAttributeAction.NewAttribute=Neues Attribut
 NewAttributeAction.NewAttributeLabel=Neues Attribut...
 NewValueAction.NewValue=Neuer Wert
-NewValueAction.NewValueNotModifiable=Warnung\! Gemäß dem Schema ist das Attribut {0} nicht
änderbar\!
-NewValueAction.NewValueQuestion=Wollen Sie trotzem einen neuen Wert hinzufügen?
-NewValueAction.NewValueSingleValued=Warnung\! Gemäß dem Schema ist das Attribut {0} einwertig\!
 PasteAction.Paste=Einfügen
 PasteAction.PasteEntries=Einträge einfügen
 PasteAction.PasteEntry=Eintrag einfügen

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java?rev=742161&r1=742160&r2=742161&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
Sun Feb  8 20:42:07 2009
@@ -21,9 +21,13 @@
 package org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor;
 
 
+import java.util.Set;
+
+import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
 import org.apache.directory.studio.ldapbrowser.core.model.IValue;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
+import org.apache.directory.studio.ldapbrowser.core.model.schema.Subschema;
 import org.apache.directory.studio.valueeditors.IValueEditor;
 import org.apache.directory.studio.valueeditors.ValueEditorManager;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -128,37 +132,78 @@
             return false;
         }
     }
-    
+
+
     @Override
     public void run()
     {
         boolean ok = true;
 
-        // validate non-modifiable attributes
         if ( getSelectedValues().length == 1 && getSelectedAttributes().length ==
0 )
         {
             IValue value = getSelectedValues()[0];
             StringBuffer message = new StringBuffer();
-            if ( !value.isEmpty() && !SchemaUtils.isModifiable( value.getAttribute().getAttributeTypeDescription()
) )
+
+            if ( value.isEmpty() )
+            {
+                // validate single-valued attributes
+                if ( value.getAttribute().getValueSize() > 1
+                    && value.getAttribute().getAttributeTypeDescription().isSingleValued()
)
+                {
+                    message.append( NLS.bind( Messages.getString( "OpenBestEditorAction.ValueSingleValued"
), //$NON-NLS-1$
+                        value.getAttribute().getDescription() ) );
+                    message.append( BrowserCoreConstants.LINE_SEPARATOR );
+                    message.append( BrowserCoreConstants.LINE_SEPARATOR );
+                }
+
+                // validate if value is allowed
+                Subschema subschema = value.getAttribute().getEntry().getSubschema();
+                Set<AttributeTypeDescription> allAtds = subschema.getAllAttributeTypeDescriptions();
+                AttributeTypeDescription atd = value.getAttribute().getAttributeTypeDescription();
+                if ( !allAtds.contains( atd ) )
+                {
+                    message.append( NLS.bind( Messages.getString( "OpenBestEditorAction.AttributeNotInSubSchema"
), //$NON-NLS-1$
+                        value.getAttribute().getDescription() ) );
+                    message.append( BrowserCoreConstants.LINE_SEPARATOR );
+                    message.append( BrowserCoreConstants.LINE_SEPARATOR );
+                }
+            }
+
+            // validate non-modifiable attributes
+            if ( !SchemaUtils.isModifiable( value.getAttribute().getAttributeTypeDescription()
) )
             {
                 message
                     .append( NLS
                         .bind(
-                            Messages.getString( "OpenBestEditorAction.EditValueNotModifiable"
), value.getAttribute().getDescription() ) ); //$NON-NLS-1$
+                            Messages.getString( "OpenBestEditorAction.ValueNotModifiable"
), value.getAttribute().getDescription() ) ); //$NON-NLS-1$
                 message.append( BrowserCoreConstants.LINE_SEPARATOR );
                 message.append( BrowserCoreConstants.LINE_SEPARATOR );
             }
 
             if ( message.length() > 0 )
             {
-                message.append( Messages.getString( "OpenBestEditorAction.EditValueQuestion"
) ); //$NON-NLS-1$
+                if ( value.isEmpty() )
+                {
+                    message.append( Messages.getString( "OpenBestEditorAction.NewValueQuestion"
) ); //$NON-NLS-1$
+                }
+                else
+                {
+                    message.append( Messages.getString( "OpenBestEditorAction.EditValueQuestion"
) ); //$NON-NLS-1$
+                }
                 ok = MessageDialog.openConfirm( getShell(), getText(), message.toString()
);
             }
-        }
 
-        if ( ok )
-        {
-            super.run();
+            if ( ok )
+            {
+                super.run();
+            }
+            else
+            {
+                if ( value.isEmpty() )
+                {
+                    value.getAttribute().deleteEmptyValue();
+                }
+            }
         }
     }
 

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/messages.properties?rev=742161&r1=742160&r2=742161&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/messages.properties
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/messages.properties
Sun Feb  8 20:42:07 2009
@@ -35,8 +35,11 @@
 EntryEditorWidgetSorterDialog.Value=Value
 EntryEditorWidgetTableMetadata.AttributeDescription=Attribute Description
 EntryEditorWidgetTableMetadata.Value=Value
-OpenBestEditorAction.EditValueNotModifiable=Warning\! According to the schema attribute {0}
is not modifiable\!
+OpenBestEditorAction.ValueNotModifiable=Warning\! According to the schema attribute {0} is
not modifiable\!
+OpenBestEditorAction.ValueSingleValued=Warning\! According to the schema attribute {0} is
single-valued\!
+OpenBestEditorAction.AttributeNotInSubSchema=Warning\! According to the schema attribute
{0} is not allowed\!
 OpenBestEditorAction.EditValueQuestion=Do you still want to edit this value?
+OpenBestEditorAction.NewValueQuestion=Do you still want to add a new value?
 OpenDefaultEditorAction.EditValue=Edit Value
 OpenSortDialogAction.Sorting=Sorting...
 ShowQuickFilterAction.ShowQuickFilter=Show Quick Filter

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/messages_de.properties?rev=742161&r1=742160&r2=742161&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/messages_de.properties
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/messages_de.properties
Sun Feb  8 20:42:07 2009
@@ -35,8 +35,11 @@
 EntryEditorWidgetSorterDialog.Value=Wert
 EntryEditorWidgetTableMetadata.AttributeDescription=Attributbeschreibung
 EntryEditorWidgetTableMetadata.Value=Wert
-OpenBestEditorAction.EditValueNotModifiable=Warnung\! Gemäß dem Schema ist das Attribut
{0} nicht änderbar\!
-OpenBestEditorAction.EditValueQuestion=Wollen Sie trotzem den Wert bearbeiten?
+OpenBestEditorAction.ValueNotModifiable=Warnung\! Gemäß Schema ist das Attribut {0} nicht
änderbar\!
+OpenBestEditorAction.ValueSingleValued=Warnung\! Gemäß Schema ist das Attribut {0} einwertig\!
+OpenBestEditorAction.AttributeNotInSubSchema=Warnung\! Gemäß Schema ist das Attribut {0}
nicht erlaubt\!
+OpenBestEditorAction.EditValueQuestion=Wollen Sie trotzdem den Wert bearbeiten?
+OpenBestEditorAction.NewValueQuestion=Wollen Sie trotzdem einen neuen Wert hinzufügen?
 OpenDefaultEditorAction.EditValue=Wert bearbeiten
 OpenSortDialogAction.Sorting=Sortierung...
 ShowQuickFilterAction.ShowQuickFilter=Schnell-Filer anzeigen

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Subschema.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Subschema.java?rev=742161&r1=742160&r2=742161&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Subschema.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Subschema.java
Sun Feb  8 20:42:07 2009
@@ -23,6 +23,7 @@
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -226,6 +227,30 @@
 
 
     /**
+     * Gets must and may attribute types descriptions of this subschema.
+     * 
+     * @return the must and may attribute types descriptions of this subschema
+     */
+    public Set<AttributeTypeDescription> getAllAttributeTypeDescriptions()
+    {
+        Set<AttributeTypeDescription> atds = new HashSet<AttributeTypeDescription>();
+        String[] musts = getMustAttributeNames();
+        for ( String must : musts )
+        {
+            AttributeTypeDescription atd = getSchema().getAttributeTypeDescription( must
);
+            atds.add( atd );
+        }
+        String[] mays = getMayAttributeNames();
+        for ( String may : mays )
+        {
+            AttributeTypeDescription atd = getSchema().getAttributeTypeDescription( may );
+            atds.add( atd );
+        }
+        return atds;
+    }
+
+
+    /**
      * Gets the schema.
      * 
      * @return the schema

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java?rev=742161&r1=742160&r2=742161&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java
Sun Feb  8 20:42:07 2009
@@ -21,10 +21,14 @@
 package org.apache.directory.studio.ldapbrowser.ui.editors.searchresult;
 
 
+import java.util.Set;
+
+import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
 import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
 import org.apache.directory.studio.ldapbrowser.core.model.IValue;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
+import org.apache.directory.studio.ldapbrowser.core.model.schema.Subschema;
 import org.apache.directory.studio.valueeditors.IValueEditor;
 import org.apache.directory.studio.valueeditors.ValueEditorManager;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -150,14 +154,31 @@
         if ( attributeHierarchies.length == 1 )
         {
             AttributeHierarchy attributeHierarchy = attributeHierarchies[0];
+            StringBuffer message = new StringBuffer();
+
+            if ( attributeHierarchy.size() == 1 && attributeHierarchy.getAttribute().getValueSize()
== 0 )
+            {
+                // validate if value is allowed
+                Subschema subschema = attributeHierarchy.getAttribute().getEntry().getSubschema();
+                Set<AttributeTypeDescription> allAtds = subschema.getAllAttributeTypeDescriptions();
+                AttributeTypeDescription atd = attributeHierarchy.getAttribute().getAttributeTypeDescription();
+                if ( !allAtds.contains( atd ) )
+                {
+                    message.append( NLS.bind( Messages.getString( "OpenBestEditorAction.AttributeNotInSubSchema"
), //$NON-NLS-1$
+                        attributeHierarchy.getAttribute().getDescription() ) );
+                    message.append( BrowserCoreConstants.LINE_SEPARATOR );
+                    message.append( BrowserCoreConstants.LINE_SEPARATOR );
+                }
+            }
+
             if ( attributeHierarchy.size() == 1
                 && attributeHierarchy.getAttribute().getValueSize() == 1
                 && attributeHierarchy.getAttributeDescription().equalsIgnoreCase(
                     attributeHierarchy.getAttribute().getValues()[0].getAttribute().getDescription()
)
                 && !attributeHierarchy.getAttribute().getValues()[0].isRdnPart()
)
             {
+                // validate non-modifiable attributes
                 IValue value = attributeHierarchy.getAttribute().getValues()[0];
-                StringBuffer message = new StringBuffer();
                 if ( !value.isEmpty() && !SchemaUtils.isModifiable( value.getAttribute().getAttributeTypeDescription()
) )
                 {
                     message
@@ -167,12 +188,12 @@
                     message.append( BrowserCoreConstants.LINE_SEPARATOR );
                     message.append( BrowserCoreConstants.LINE_SEPARATOR );
                 }
+            }
 
-                if ( message.length() > 0 )
-                {
-                    message.append( Messages.getString( "OpenBestEditorAction.EditValueQuestion"
) ); //$NON-NLS-1$
-                    ok = MessageDialog.openConfirm( getShell(), getText(), message.toString()
);
-                }
+            if ( message.length() > 0 )
+            {
+                message.append( Messages.getString( "OpenBestEditorAction.EditValueQuestion"
) ); //$NON-NLS-1$
+                ok = MessageDialog.openConfirm( getShell(), getText(), message.toString()
);
             }
         }
 

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties?rev=742161&r1=742160&r2=742161&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties
Sun Feb  8 20:42:07 2009
@@ -18,6 +18,7 @@
 FilterAndSortRunnable.FilterAndSort=Filter and Sort
 FilterAndSortRunnable.Filtering=Filtering...
 FilterAndSortRunnable.Sorting=Sorting...
+OpenBestEditorAction.AttributeNotInSubSchema=Warning\! According to the schema attribute
{0} is not allowed\!
 OpenBestEditorAction.EditValueNotModifiable=Warning\! According to the schema attribute {0}
is not modifiable\!
 OpenBestEditorAction.EditValueQuestion=Do you still want to edit this value?
 OpenDefaultEditorAction.EditValue=Edit Value

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties?rev=742161&r1=742160&r2=742161&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties
Sun Feb  8 20:42:07 2009
@@ -18,8 +18,9 @@
 FilterAndSortRunnable.FilterAndSort=Filtern und Sortieren
 FilterAndSortRunnable.Filtering=Filtern...
 FilterAndSortRunnable.Sorting=Sortieren...
-OpenBestEditorAction.EditValueNotModifiable=Warnung\! Gemäß dem Schema ist das Attribut
{0} nicht änderbar\!
-OpenBestEditorAction.EditValueQuestion=Wollen Sie trotzem den Wert bearbeiten?
+OpenBestEditorAction.AttributeNotInSubSchema=Warnung\! Gemäß Schema ist das Attribut {0}
nicht erlaubt\!
+OpenBestEditorAction.EditValueNotModifiable=Warnung\! Gemäß Schema ist das Attribut {0}
nicht änderbar\!
+OpenBestEditorAction.EditValueQuestion=Wollen Sie trotzdem den Wert bearbeiten?
 OpenDefaultEditorAction.EditValue=Wert editieren
 OpenEntryEditorAction.EditEntry=Eintrag editieren...
 OpenSearchResultEditorPreferencePage.Preferences=Pr\u00E4ferenzen...



Mime
View raw message