directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r640110 - /directory/studio/branches/1.1.0/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java
Date Sat, 22 Mar 2008 22:46:23 GMT
Author: seelmann
Date: Sat Mar 22 15:46:22 2008
New Revision: 640110

URL: http://svn.apache.org/viewvc?rev=640110&view=rev
Log:
Fixed paste action in search result editor

Modified:
    directory/studio/branches/1.1.0/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java

Modified: directory/studio/branches/1.1.0/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java?rev=640110&r1=640109&r2=640110&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java
(original)
+++ directory/studio/branches/1.1.0/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java
Sat Mar 22 15:46:22 2008
@@ -24,8 +24,10 @@
 import org.apache.directory.studio.ldapbrowser.common.actions.PasteAction;
 import org.apache.directory.studio.ldapbrowser.common.dnd.ValuesTransfer;
 import org.apache.directory.studio.ldapbrowser.core.jobs.CreateValuesJob;
+import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 import org.apache.directory.studio.ldapbrowser.core.model.IValue;
+import org.apache.directory.studio.ldapbrowser.core.model.impl.Value;
 
 
 /**
@@ -35,12 +37,18 @@
 public class SearchResultEditorPasteAction extends PasteAction
 {
 
+    /**
+     * Creates a new instance of SearchResultEditorPasteAction.
+     */
     public SearchResultEditorPasteAction()
     {
         super();
     }
 
 
+    /**
+     * @see org.apache.directory.studio.ldapbrowser.common.actions.PasteAction#getText()
+     */
     public String getText()
     {
         IValue[] values = getValuesToPaste();
@@ -53,6 +61,9 @@
     }
 
 
+    /**
+     * @see org.apache.directory.studio.ldapbrowser.common.actions.PasteAction#isEnabled()
+     */
     public boolean isEnabled()
     {
         if ( this.getValuesToPaste() != null )
@@ -64,25 +75,24 @@
     }
 
 
+    /**
+     * @see org.apache.directory.studio.ldapbrowser.common.actions.PasteAction#run()
+     */
     public void run()
     {
         IValue[] values = getValuesToPaste();
         if ( values != null )
         {
-//            String attributeDescription = getSelectedAttributeHierarchies()[0].getAttribute().getDescription();
-//
-//            String[] attributeDescriptions = new String[values.length];
-//            Object[] rawValues = new Object[values.length];
-//            for ( int v = 0; v < values.length; v++ )
-//            {
-//                attributeDescriptions[v] = attributeDescription;
-//                rawValues[v] = values[v].getRawValue();
-//            }
-//            IEntry entry = getSelectedAttributeHierarchies()[0].getAttribute().getEntry();
-//
-//            new CreateValuesJob( entry, attributeDescriptions, rawValues ).execute();
-            IEntry entry = getSelectedAttributeHierarchies()[0].getAttribute().getEntry();
-            new CreateValuesJob( entry, values ).execute();
+            IAttribute attribute = getSelectedAttributeHierarchies()[0].getAttribute();
+            IEntry entry = attribute.getEntry();
+
+            IValue[] newValues = new IValue[values.length]; 
+            for ( int v = 0; v < values.length; v++ )
+            {
+                newValues[v] = new Value( attribute, values[v].getRawValue() );
+            }
+            
+            new CreateValuesJob( entry, newValues ).execute();
         }
     }
 
@@ -108,14 +118,6 @@
                 IValue[] values = ( IValue[] ) content;
                 return values;
             }
-
-            // Object content =
-            // this.getFromClipboard(LdifAttrValLinesTransfer.getInstance());
-            // if (content != null && content instanceof LdifAttrValLine[])
-            // {
-            // LdifAttrValLine[] lines = (LdifAttrValLine[]) content;
-            // return lines;
-            // }
         }
 
         return null;



Mime
View raw message