directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r981454 - in /directory/studio/trunk: common.ui/ common.ui/resources/ common.ui/resources/icons/ common.ui/src/main/java/org/apache/directory/studio/common/ui/ common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/ connectio...
Date Mon, 02 Aug 2010 11:07:00 GMT
Author: pamarcelot
Date: Mon Aug  2 11:06:59 2010
New Revision: 981454

URL: http://svn.apache.org/viewvc?rev=981454&view=rev
Log:
Fix for DIRSTUDIO-685 (Move duplicated 'ViewFormWidget' class to the 'common.ui' plugin).

Added:
    directory/studio/trunk/common.ui/resources/
    directory/studio/trunk/common.ui/resources/icons/
    directory/studio/trunk/common.ui/resources/icons/pulldown.gif   (with props)
    directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIConstants.java
    directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIPlugin.java
    directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/ViewFormWidget.java
      - copied, changed from r981428, directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ViewFormWidget.java
Removed:
    directory/studio/trunk/connection.ui/resources/icons/pulldown.gif
    directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ViewFormWidget.java
    directory/studio/trunk/ldapbrowser.common/resources/icons/pulldown.gif
    directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ViewFormWidget.java
Modified:
    directory/studio/trunk/common.ui/plugin.properties
    directory/studio/trunk/common.ui/pom.xml
    directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java
    directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
    directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionWidget.java
    directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
    directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java
    directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidget.java
    directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorWidget.java

Modified: directory/studio/trunk/common.ui/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common.ui/plugin.properties?rev=981454&r1=981453&r2=981454&view=diff
==============================================================================
--- directory/studio/trunk/common.ui/plugin.properties (original)
+++ directory/studio/trunk/common.ui/plugin.properties Mon Aug  2 11:06:59 2010
@@ -15,5 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+Plugin_id=org.apache.directory.studio.common.ui
+
 Pref_StudioPage_id=org.apache.directory.studio.StudioPreferencePage
 Pref_StudioPage_name=Apache Directory Studio

Modified: directory/studio/trunk/common.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common.ui/pom.xml?rev=981454&r1=981453&r2=981454&view=diff
==============================================================================
--- directory/studio/trunk/common.ui/pom.xml (original)
+++ directory/studio/trunk/common.ui/pom.xml Mon Aug  2 11:06:59 2010
@@ -111,6 +111,7 @@
             <Bundle-SymbolicName>${groupId}.${artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
+            <Bundle-Activator>org.apache.directory.studio.common.ui.CommonUIPlugin</Bundle-Activator>
             <Require-Bundle>org.eclipse.ui,
  org.eclipse.core.runtime
             </Require-Bundle>

Added: directory/studio/trunk/common.ui/resources/icons/pulldown.gif
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common.ui/resources/icons/pulldown.gif?rev=981454&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/common.ui/resources/icons/pulldown.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIConstants.java?rev=981454&view=auto
==============================================================================
--- directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIConstants.java
(added)
+++ directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIConstants.java
Mon Aug  2 11:06:59 2010
@@ -0,0 +1,36 @@
+/*
+ *  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.studio.common.ui;
+
+
+/**
+ * Constants used in the connection UI plugin.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public interface CommonUIConstants
+{
+    /** The plug-in ID */
+    public static final String PLUGIN_ID = CommonUIPlugin.getDefault().getPluginProperties().getString(
"Plugin_id" ); //$NON-NLS-1$
+
+    /** The pull-down image */
+    public static final String IMG_PULLDOWN = "resources/icons/pulldown.gif"; //$NON-NLS-1$
+}

Added: directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIPlugin.java?rev=981454&view=auto
==============================================================================
--- directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIPlugin.java
(added)
+++ directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/CommonUIPlugin.java
Mon Aug  2 11:06:59 2010
@@ -0,0 +1,167 @@
+/*
+ *  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.studio.common.ui;
+
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.PropertyResourceBundle;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class CommonUIPlugin extends AbstractUIPlugin
+{
+    /** The shared plugin instance. */
+    private static CommonUIPlugin plugin;
+
+    /** The plugin properties */
+    private PropertyResourceBundle properties;
+
+
+    /**
+     * The constructor
+     */
+    public CommonUIPlugin()
+    {
+        plugin = this;
+    }
+
+
+    /**
+     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+     */
+    public void start( BundleContext context ) throws Exception
+    {
+        super.start( context );
+    }
+
+
+    /**
+     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+     */
+    public void stop( BundleContext context ) throws Exception
+    {
+        plugin = null;
+        super.stop( context );
+    }
+
+
+    /**
+     * Returns the shared instance
+     *
+     * @return the shared instance
+     */
+    public static CommonUIPlugin getDefault()
+    {
+        return plugin;
+    }
+
+
+    /**
+     * Use this method to get SWT images. Use the IMG_ constants from
+     * BrowserWidgetsConstants for the key.
+     *
+     * @param key
+     *                The key (relative path to the image in filesystem)
+     * @return The image descriptor or null
+     */
+    public ImageDescriptor getImageDescriptor( String key )
+    {
+        if ( key != null )
+        {
+            URL url = FileLocator.find( getBundle(), new Path( key ), null );
+            if ( url != null )
+                return ImageDescriptor.createFromURL( url );
+            else
+                return null;
+        }
+        else
+        {
+            return null;
+        }
+    }
+
+
+    /**
+     * Use this method to get SWT images. Use the IMG_ constants from
+     * BrowserWidgetsConstants for the key. A ImageRegistry is used to manage the
+     * the key->Image mapping.
+     * <p>
+     * Note: Don't dispose the returned SWT Image. It is disposed
+     * automatically when the plugin is stopped.
+     *
+     * @param key
+     *                The key (relative path to the image in filesystem)
+     * @return The SWT Image or null
+     */
+    public Image getImage( String key )
+    {
+        Image image = getImageRegistry().get( key );
+        if ( image == null )
+        {
+            ImageDescriptor id = getImageDescriptor( key );
+            if ( id != null )
+            {
+                image = id.createImage();
+                getImageRegistry().put( key, image );
+            }
+        }
+        return image;
+    }
+
+
+    /**
+     * Gets the plugin properties.
+     *
+     * @return
+     *      the plugin properties
+     */
+    public PropertyResourceBundle getPluginProperties()
+    {
+        if ( properties == null )
+        {
+            try
+            {
+                properties = new PropertyResourceBundle( FileLocator.openStream( this.getBundle(),
new Path(
+                    "plugin.properties" ), false ) ); //$NON-NLS-1$
+            }
+            catch ( IOException e )
+            {
+                // We can't use the PLUGIN_ID constant since loading the plugin.properties
file has failed,
+                // So we're using a default plugin id.
+                getLog().log( new Status( Status.ERROR, "org.apache.directory.studio.common.ui",
Status.OK, //$NON-NLS-1$
+                    Messages.getString( "CommonUIPlugin.UnableGetPluginProperties" ), e )
); //$NON-NLS-1$
+            }
+        }
+
+        return properties;
+    }
+}

Copied: directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/ViewFormWidget.java
(from r981428, directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ViewFormWidget.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/ViewFormWidget.java?p2=directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/ViewFormWidget.java&p1=directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ViewFormWidget.java&r1=981428&r2=981454&rev=981454&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ViewFormWidget.java
(original)
+++ directory/studio/trunk/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/ViewFormWidget.java
Mon Aug  2 11:06:59 2010
@@ -18,12 +18,11 @@
  *  
  */
 
-package org.apache.directory.studio.ldapbrowser.common.widgets;
+package org.apache.directory.studio.common.ui.widgets;
 
 
-import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
-import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
+import org.apache.directory.studio.common.ui.CommonUIConstants;
+import org.apache.directory.studio.common.ui.CommonUIPlugin;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
@@ -62,7 +61,6 @@ import org.eclipse.swt.widgets.ToolItem;
  */
 public abstract class ViewFormWidget
 {
-
     /** The view form control */
     protected ViewForm control;
 
@@ -117,7 +115,7 @@ public abstract class ViewFormWidget
         this.menuManager = new MenuManager();
         menuToolBar = new ToolBar( control, SWT.FLAT | SWT.RIGHT );
         ToolItem ti = new ToolItem( menuToolBar, SWT.PUSH, 0 );
-        ti.setImage( BrowserCommonActivator.getDefault().getImage( BrowserCommonConstants.IMG_PULLDOWN
) );
+        ti.setImage( CommonUIPlugin.getDefault().getImage( CommonUIConstants.IMG_PULLDOWN
) );
         ti.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )

Modified: directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java?rev=981454&r1=981453&r2=981454&view=diff
==============================================================================
--- directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java
(original)
+++ directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java
Mon Aug  2 11:06:59 2010
@@ -71,9 +71,6 @@ public interface ConnectionUIConstants
     /** The new connection wizard image */
     public static final String IMG_CONNECTION_WIZARD = "resources/icons/connection_wizard.gif";
//$NON-NLS-1$
 
-    /** The pull-down image */
-    public static final String IMG_PULLDOWN = "resources/icons/pulldown.gif"; //$NON-NLS-1$
-
     /** The image used for connection folders. */
     public static final String IMG_CONNECTION_FOLDER = "resources/icons/connection_folder.gif";
//$NON-NLS-1$
 
@@ -86,20 +83,20 @@ public interface ConnectionUIConstants
     /** The collapse all image */
     public static final String IMG_COLLAPSEALL = "resources/icons/collapseall.gif"; //$NON-NLS-1$
 
-    public static final String TYPENAME = ConnectionUIPlugin.getDefault().getPluginProperties().getString(
-        "ConnectionTransfert_Typename" ); //$NON-NLS-1$
+    public static final String TYPENAME = ConnectionUIPlugin.getDefault().getPluginProperties()
+        .getString( "ConnectionTransfert_Typename" ); //$NON-NLS-1$
 
-    public static final String CMD_COPY = ConnectionUIPlugin.getDefault().getPluginProperties().getString(
-        "Cmd_Copy_id" ); //$NON-NLS-1$
+    public static final String CMD_COPY = ConnectionUIPlugin.getDefault().getPluginProperties()
+        .getString( "Cmd_Copy_id" ); //$NON-NLS-1$
 
-    public static final String CMD_PASTE = ConnectionUIPlugin.getDefault().getPluginProperties().getString(
-        "Cmd_Paste_id" ); //$NON-NLS-1$
+    public static final String CMD_PASTE = ConnectionUIPlugin.getDefault().getPluginProperties()
+        .getString( "Cmd_Paste_id" ); //$NON-NLS-1$
 
-    public static final String CMD_DELETE = ConnectionUIPlugin.getDefault().getPluginProperties().getString(
-        "Cmd_Delete_id" ); //$NON-NLS-1$
+    public static final String CMD_DELETE = ConnectionUIPlugin.getDefault().getPluginProperties()
+        .getString( "Cmd_Delete_id" ); //$NON-NLS-1$
 
-    public static final String CMD_PROPERTIES = ConnectionUIPlugin.getDefault().getPluginProperties().getString(
-        "Cmd_Properties_id" ); //$NON-NLS-1$
+    public static final String CMD_PROPERTIES = ConnectionUIPlugin.getDefault().getPluginProperties()
+        .getString( "Cmd_Properties_id" ); //$NON-NLS-1$
 
     public static final String NEW_WIZARD_NEW_CONNECTION = ConnectionUIPlugin.getDefault().getPluginProperties()
         .getString( "NewWizards_NewConnectionWizard_id" ); //$NON-NLS-1$

Modified: directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java?rev=981454&r1=981453&r2=981454&view=diff
==============================================================================
--- directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
(original)
+++ directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
Mon Aug  2 11:06:59 2010
@@ -212,7 +212,7 @@ public class ConnectionUIPlugin extends 
                 // We can't use the PLUGIN_ID constant since loading the plugin.properties
file has failed,
                 // So we're using a default plugin id.
                 getLog().log( new Status( Status.ERROR, "org.apache.directory.studio.connection.ui",
Status.OK, //$NON-NLS-1$
-                    Messages.getString( "ConnectionUIPlugin.UnableGetPluginProperties" ),
e ) ); //$NON-NLS-1$
+                    Messages.getString( "CommonUIPlugin.UnableGetPluginProperties" ), e )
); //$NON-NLS-1$
             }
         }
 

Modified: directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionWidget.java?rev=981454&r1=981453&r2=981454&view=diff
==============================================================================
--- directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionWidget.java
(original)
+++ directory/studio/trunk/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionWidget.java
Mon Aug  2 11:06:59 2010
@@ -21,6 +21,7 @@
 package org.apache.directory.studio.connection.ui.widgets;
 
 
+import org.apache.directory.studio.common.ui.widgets.ViewFormWidget;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.viewers.TreeViewer;

Modified: directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java?rev=981454&r1=981453&r2=981454&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
(original)
+++ directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
Mon Aug  2 11:06:59 2010
@@ -116,7 +116,6 @@ public interface BrowserCommonConstants
     public static final String IMG_INPLACE_TEXTEDITOR = "resources/icons/inplace_texteditor.gif";
//$NON-NLS-1$
     public static final String IMG_MULTIVALUEDEDITOR = "resources/icons/multivaluededitor.gif";
//$NON-NLS-1$
     public static final String IMG_DNEDITOR = "resources/icons/dneditor.gif"; //$NON-NLS-1$
-    public static final String IMG_PULLDOWN = "resources/icons/pulldown.gif"; //$NON-NLS-1$
     public static final String IMG_SORT = "resources/icons/sort.gif"; //$NON-NLS-1$
     public static final String IMG_DIT = "resources/icons/dit.gif"; //$NON-NLS-1$
     public static final String IMG_ENTRY = "resources/icons/entry_default.gif"; //$NON-NLS-1$

Modified: directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java?rev=981454&r1=981453&r2=981454&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java
(original)
+++ directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java
Mon Aug  2 11:06:59 2010
@@ -22,8 +22,8 @@ package org.apache.directory.studio.ldap
 
 
 import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.common.ui.widgets.ViewFormWidget;
 import org.apache.directory.studio.ldapbrowser.common.dialogs.SelectEntryDialog;
-import org.apache.directory.studio.ldapbrowser.common.widgets.ViewFormWidget;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.viewers.TreeViewer;

Modified: directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidget.java?rev=981454&r1=981453&r2=981454&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidget.java
(original)
+++ directory/studio/trunk/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidget.java
Mon Aug  2 11:06:59 2010
@@ -21,7 +21,7 @@
 package org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor;
 
 
-import org.apache.directory.studio.ldapbrowser.common.widgets.ViewFormWidget;
+import org.apache.directory.studio.common.ui.widgets.ViewFormWidget;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;

Modified: directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorWidget.java?rev=981454&r1=981453&r2=981454&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorWidget.java
(original)
+++ directory/studio/trunk/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorWidget.java
Mon Aug  2 11:06:59 2010
@@ -21,7 +21,7 @@
 package org.apache.directory.studio.ldapbrowser.ui.editors.searchresult;
 
 
-import org.apache.directory.studio.ldapbrowser.common.widgets.ViewFormWidget;
+import org.apache.directory.studio.common.ui.widgets.ViewFormWidget;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;



Mime
View raw message