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/08/27 00:36:14 UTC
svn commit: r569899 [9/9] - in /directory/studio/trunk:
studio-aciitemeditor/META-INF/
studio-aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/
studio-aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueedito...
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifWizard.java Sun Aug 26 15:36:01 2007
@@ -26,7 +26,7 @@
import org.apache.directory.studio.ldapbrowser.core.jobs.ImportLdifJob;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
@@ -55,7 +55,7 @@
private String ldifFilename;
/** The import connection. */
- private IConnection importConnection;
+ private IBrowserConnection importConnection;
/** The enable logging flag. */
private boolean enableLogging;
@@ -82,7 +82,7 @@
*
* @param importConnection the import connection
*/
- public ImportLdifWizard( IConnection importConnection )
+ public ImportLdifWizard( IBrowserConnection importConnection )
{
super.setWindowTitle( "LDIF Import" );
this.importConnection = importConnection;
@@ -108,27 +108,27 @@
Object o = selection.getFirstElement();
if ( o instanceof IEntry )
{
- importConnection = ( ( IEntry ) o ).getConnection();
+ importConnection = ( ( IEntry ) o ).getBrowserConnection();
}
else if ( o instanceof ISearchResult )
{
- importConnection = ( ( ISearchResult ) o ).getEntry().getConnection();
+ importConnection = ( ( ISearchResult ) o ).getEntry().getBrowserConnection();
}
else if ( o instanceof IBookmark )
{
- importConnection = ( ( IBookmark ) o ).getConnection();
+ importConnection = ( ( IBookmark ) o ).getBrowserConnection();
}
else if ( o instanceof IAttribute )
{
- importConnection = ( ( IAttribute ) o ).getEntry().getConnection();
+ importConnection = ( ( IAttribute ) o ).getEntry().getBrowserConnection();
}
else if ( o instanceof IValue )
{
- importConnection = ( ( IValue ) o ).getAttribute().getEntry().getConnection();
+ importConnection = ( ( IValue ) o ).getAttribute().getEntry().getBrowserConnection();
}
- else if ( o instanceof IConnection )
+ else if ( o instanceof IBrowserConnection )
{
- importConnection = ( IConnection ) o;
+ importConnection = ( IBrowserConnection ) o;
}
else
{
@@ -192,7 +192,7 @@
*
* @return the import connection
*/
- public IConnection getImportConnection()
+ public IBrowserConnection getImportConnection()
{
return importConnection;
}
@@ -203,7 +203,7 @@
*
* @param importConnection the import connection
*/
- public void setImportConnection( IConnection importConnection )
+ public void setImportConnection( IBrowserConnection importConnection )
{
this.importConnection = importConnection;
}
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java Sun Aug 26 15:36:01 2007
@@ -138,7 +138,7 @@
bookmarkEntryWidget = new EntryWidget();
bookmarkEntryWidget.addWidgetModifyListener( this );
bookmarkEntryWidget.createWidget( innerComposite );
- bookmarkEntryWidget.setInput( entry.getConnection(), entry.getDn() );
+ bookmarkEntryWidget.setInput( entry.getBrowserConnection(), entry.getDn() );
setControl( composite );
}
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java Sun Aug 26 15:36:01 2007
@@ -28,7 +28,7 @@
import org.apache.directory.studio.ldapbrowser.core.model.DN;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
@@ -110,13 +110,13 @@
{
selectedEntry = ( ( IValue ) o ).getAttribute().getEntry();
}
- else if ( o instanceof IConnection )
+ else if ( o instanceof IBrowserConnection )
{
- selectedEntry = ( ( IConnection ) o ).getRootDSE();
+ selectedEntry = ( ( IBrowserConnection ) o ).getRootDSE();
}
else if ( o instanceof ISearch )
{
- selectedEntry = ( ( ISearch ) o ).getConnection().getRootDSE();
+ selectedEntry = ( ( ISearch ) o ).getBrowserConnection().getRootDSE();
}
else if ( o instanceof BrowserCategory )
{
@@ -124,7 +124,7 @@
}
else if ( o instanceof BrowserSearchResultPage )
{
- selectedEntry = ( ( BrowserSearchResultPage ) o ).getSearch().getConnection().getRootDSE();
+ selectedEntry = ( ( BrowserSearchResultPage ) o ).getSearch().getBrowserConnection().getRootDSE();
}
else if ( o instanceof BrowserEntryPage )
{
@@ -201,8 +201,8 @@
{
String name = mainPage.getBookmarkName();
DN dn = mainPage.getBookmarkDn();
- IBookmark bookmark = new Bookmark( selectedEntry.getConnection(), dn, name );
- selectedEntry.getConnection().getBookmarkManager().addBookmark( bookmark );
+ IBookmark bookmark = new Bookmark( selectedEntry.getBrowserConnection(), dn, name );
+ selectedEntry.getBrowserConnection().getBookmarkManager().addBookmark( bookmark );
}
mainPage.saveDialogSettings();
return true;
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryObjectclassWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryObjectclassWizardPage.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryObjectclassWizardPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryObjectclassWizardPage.java Sun Aug 26 15:36:01 2007
@@ -27,13 +27,11 @@
import java.util.List;
import java.util.Set;
-import org.apache.directory.studio.ldapbrowser.common.jobs.RunnableContextJobAdapter;
import org.apache.directory.studio.ldapbrowser.common.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.internal.model.Attribute;
import org.apache.directory.studio.ldapbrowser.core.internal.model.DummyEntry;
import org.apache.directory.studio.ldapbrowser.core.internal.model.Value;
-import org.apache.directory.studio.ldapbrowser.core.jobs.OpenConnectionsJob;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
import org.apache.directory.studio.ldapbrowser.core.model.ModelModificationException;
@@ -158,11 +156,11 @@
if ( wizard.getSelectedConnection() != null )
{
- if( !wizard.getSelectedConnection().isOpened() )
- {
- OpenConnectionsJob job = new OpenConnectionsJob(wizard.getSelectedConnection());
- RunnableContextJobAdapter.execute( job, getContainer() );
- }
+// if ( !wizard.getSelectedConnection().isOpened() )
+// {
+// OpenConnectionsJob job = new OpenConnectionsJob( wizard.getSelectedConnection().getConnection() );
+// RunnableContextJobAdapter.execute( job, getContainer() );
+// }
availableObjectClasses.addAll( Arrays.asList( wizard.getSelectedConnection().getSchema()
.getObjectClassDescriptions() ) );
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java Sun Aug 26 15:36:01 2007
@@ -27,12 +27,13 @@
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.EntryWidget;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
+import org.apache.directory.studio.ldapbrowser.core.internal.model.DummyConnection;
import org.apache.directory.studio.ldapbrowser.core.internal.model.DummyEntry;
import org.apache.directory.studio.ldapbrowser.core.jobs.InitializeAttributesJob;
import org.apache.directory.studio.ldapbrowser.core.jobs.ReadEntryJob;
import org.apache.directory.studio.ldapbrowser.core.model.DN;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContentRecord;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
@@ -139,7 +140,7 @@
{
if ( templateButton.getSelection() )
{
- final IConnection connection = entryWidget.getConnection();
+ final IBrowserConnection connection = entryWidget.getConnection();
final DN dn = entryWidget.getDn();
final IEntry[] templateEntries = new IEntry[1];
@@ -195,7 +196,7 @@
EventRegistry.suspendEventFireingInCurrentThread();
LdifContentRecord record = ModelConverter.entryToLdifContentRecord( templateEntries[0] );
- DummyEntry prototypeEntry = ModelConverter.ldifContentRecordToEntry( record, connection );
+ DummyEntry prototypeEntry = ModelConverter.ldifContentRecordToEntry( record, new DummyConnection( connection.getSchema() ) );
IAttribute[] attributes = prototypeEntry.getAttributes();
for ( int i = 0; i < attributes.length; i++ )
{
@@ -217,7 +218,7 @@
}
else
{
- wizard.setPrototypeEntry( new DummyEntry( new DN(), wizard.getSelectedConnection() ) );
+ wizard.setPrototypeEntry( new DummyEntry( new DN(), new DummyConnection( wizard.getSelectedConnection().getSchema() ) ) );
}
return super.getNextPage();
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryWizard.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryWizard.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryWizard.java Sun Aug 26 15:36:01 2007
@@ -26,12 +26,13 @@
import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserEntryPage;
import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserSearchResultPage;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
+import org.apache.directory.studio.ldapbrowser.core.internal.model.DummyConnection;
import org.apache.directory.studio.ldapbrowser.core.internal.model.DummyEntry;
import org.apache.directory.studio.ldapbrowser.core.jobs.CreateEntryJob;
import org.apache.directory.studio.ldapbrowser.core.model.DN;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
@@ -77,7 +78,7 @@
private IEntry selectedEntry;
/** The selected connection. */
- private IConnection selectedConnection;
+ private IBrowserConnection selectedConnection;
/** The prototype entry. */
private DummyEntry prototypeEntry;
@@ -114,37 +115,37 @@
if ( o instanceof IEntry )
{
selectedEntry = ( ( IEntry ) o );
- selectedConnection = selectedEntry.getConnection();
+ selectedConnection = selectedEntry.getBrowserConnection();
}
else if ( o instanceof ISearchResult )
{
selectedEntry = ( ( ISearchResult ) o ).getEntry();
- selectedConnection = selectedEntry.getConnection();
+ selectedConnection = selectedEntry.getBrowserConnection();
}
else if ( o instanceof IBookmark )
{
selectedEntry = ( ( IBookmark ) o ).getEntry();
- selectedConnection = selectedEntry.getConnection();
+ selectedConnection = selectedEntry.getBrowserConnection();
}
else if ( o instanceof IAttribute )
{
selectedEntry = ( ( IAttribute ) o ).getEntry();
- selectedConnection = selectedEntry.getConnection();
+ selectedConnection = selectedEntry.getBrowserConnection();
}
else if ( o instanceof IValue )
{
selectedEntry = ( ( IValue ) o ).getAttribute().getEntry();
- selectedConnection = selectedEntry.getConnection();
+ selectedConnection = selectedEntry.getBrowserConnection();
}
else if ( o instanceof ISearch )
{
selectedEntry = null;
- selectedConnection = ( ( ISearch ) o ).getConnection();
+ selectedConnection = ( ( ISearch ) o ).getBrowserConnection();
}
- else if ( o instanceof IConnection )
+ else if ( o instanceof IBrowserConnection )
{
selectedEntry = null;
- selectedConnection = ( IConnection ) o;
+ selectedConnection = ( IBrowserConnection ) o;
}
else if ( o instanceof BrowserCategory )
{
@@ -154,12 +155,12 @@
else if ( o instanceof BrowserSearchResultPage )
{
selectedEntry = null;
- selectedConnection = ( ( BrowserSearchResultPage ) o ).getSearch().getConnection();
+ selectedConnection = ( ( BrowserSearchResultPage ) o ).getSearch().getBrowserConnection();
}
else if ( o instanceof BrowserEntryPage )
{
selectedEntry = null;
- selectedConnection = ( ( BrowserEntryPage ) o ).getEntry().getConnection();
+ selectedConnection = ( ( BrowserEntryPage ) o ).getEntry().getBrowserConnection();
}
else
{
@@ -169,8 +170,9 @@
if ( selectedConnection != null )
{
- selectedConnection.suspend();
- prototypeEntry = new DummyEntry( new DN(), selectedConnection );
+// selectedConnection.suspend();
+ DummyConnection prototypeConnection = new DummyConnection( selectedConnection.getSchema() );
+ prototypeEntry = new DummyEntry( new DN(), prototypeConnection );
}
}
@@ -266,12 +268,12 @@
*/
public boolean performCancel()
{
- if ( selectedConnection != null && selectedConnection.isOpened() )
+ if ( selectedConnection != null )
{
- EventRegistry.suspendEventFireingInCurrentThread();
- selectedConnection.reset();
- EventRegistry.resumeEventFireingInCurrentThread();
- selectedConnection.reset();
+// EventRegistry.suspendEventFireingInCurrentThread();
+// selectedConnection.reset();
+// EventRegistry.resumeEventFireingInCurrentThread();
+// selectedConnection.reset();
}
return true;
@@ -285,21 +287,20 @@
{
try
{
- if ( selectedConnection != null && selectedConnection.isOpened() )
+ if ( selectedConnection != null )
{
typePage.saveDialogSettings();
ocPage.saveDialogSettings();
dnPage.saveDialogSettings();
- getSelectedConnection().reset();
-
- CreateEntryJob job = new CreateEntryJob( new IEntry[]
- { getPrototypeEntry() } );
+// getSelectedConnection().reset();
+
+ CreateEntryJob job = new CreateEntryJob( prototypeEntry, selectedConnection );
RunnableContextJobAdapter.execute( job, getContainer() );
if ( !job.getExternalResult().isOK() )
{
- getSelectedConnection().suspend();
+// getSelectedConnection().suspend();
return false;
}
else
@@ -336,7 +337,7 @@
*
* @return the selected connection
*/
- public IConnection getSelectedConnection()
+ public IBrowserConnection getSelectedConnection()
{
return selectedConnection;
}
Modified: directory/studio/trunk/studio-ldifeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/META-INF/MANIFEST.MF?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/studio-ldifeditor/META-INF/MANIFEST.MF Sun Aug 26 15:36:01 2007
@@ -15,6 +15,8 @@
org.eclipse.ui.views,
org.eclipse.ui.forms,
org.eclipse.jface.text,
+ org.apache.directory.studio.connection.core,
+ org.apache.directory.studio.connection.ui,
org.apache.directory.studio.ldapbrowser.core,
org.apache.directory.studio.ldapbrowser.common
Eclipse-LazyStart: true
Modified: directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java (original)
+++ directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java Sun Aug 26 15:36:01 2007
@@ -28,7 +28,7 @@
import org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor.EntryEditorWidgetConfiguration;
import org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor.EntryEditorWidgetUniversalListener;
import org.apache.directory.studio.ldapbrowser.core.internal.model.DummyConnection;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ModelModificationException;
import org.apache.directory.studio.ldapbrowser.core.model.NameException;
@@ -59,7 +59,7 @@
public static final int MAX_HEIGHT = 250;
- private IConnection connection;
+ private IBrowserConnection connection;
private LdifRecord ldifRecord;
@@ -77,19 +77,19 @@
private IContextActivation contextActivation;
- public LdifEntryEditorDialog( Shell parentShell, IConnection connection, LdifContentRecord ldifRecord )
+ public LdifEntryEditorDialog( Shell parentShell, IBrowserConnection connection, LdifContentRecord ldifRecord )
{
this( parentShell, connection, ldifRecord, null );
}
- public LdifEntryEditorDialog( Shell parentShell, IConnection connection, LdifChangeAddRecord ldifRecord )
+ public LdifEntryEditorDialog( Shell parentShell, IBrowserConnection connection, LdifChangeAddRecord ldifRecord )
{
this( parentShell, connection, ldifRecord, null );
}
- private LdifEntryEditorDialog( Shell parentShell, IConnection connection, LdifRecord ldifRecord, String s )
+ private LdifEntryEditorDialog( Shell parentShell, IBrowserConnection connection, LdifRecord ldifRecord, String s )
{
super( parentShell );
setShellStyle( getShellStyle() | SWT.RESIZE );
Modified: directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java (original)
+++ directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java Sun Aug 26 15:36:01 2007
@@ -23,7 +23,7 @@
import org.apache.directory.studio.ldapbrowser.common.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifFile;
import org.apache.directory.studio.ldifeditor.LdifEditorActivator;
import org.apache.directory.studio.ldifeditor.LdifEditorConstants;
@@ -430,7 +430,7 @@
}
- public IConnection getConnection()
+ public IBrowserConnection getConnection()
{
return ldifEditorWidget.getConnection();
}
Modified: directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java (original)
+++ directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java Sun Aug 26 15:36:01 2007
@@ -22,7 +22,7 @@
import org.apache.directory.studio.ldapbrowser.core.jobs.ExecuteLdifJob;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldifeditor.LdifEditorActivator;
import org.apache.directory.studio.ldifeditor.LdifEditorConstants;
import org.eclipse.jface.action.Action;
@@ -58,7 +58,7 @@
public void run()
{
- IConnection connection = editor.getConnection();
+ IBrowserConnection connection = editor.getConnection();
String ldif = editor.getLdifModel().toRawString();
new ExecuteLdifJob( connection, ldif, true ).execute();
Modified: directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ILdifEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ILdifEditor.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ILdifEditor.java (original)
+++ directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ILdifEditor.java Sun Aug 26 15:36:01 2007
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldifeditor.editor;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifFile;
import org.eclipse.core.runtime.IAdaptable;
@@ -50,5 +50,5 @@
* @return
* the Connection
*/
- public IConnection getConnection();
+ public IBrowserConnection getConnection();
}
Modified: directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java (original)
+++ directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java Sun Aug 26 15:36:01 2007
@@ -24,15 +24,16 @@
import java.io.File;
import java.util.ResourceBundle;
+import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.connection.core.event.ConnectionEventRegistry;
+import org.apache.directory.studio.connection.core.event.ConnectionUpdateListener;
+import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.common.actions.ValueEditorPreferencesAction;
import org.apache.directory.studio.ldapbrowser.common.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
-import org.apache.directory.studio.ldapbrowser.core.events.ConnectionUpdateEvent;
-import org.apache.directory.studio.ldapbrowser.core.events.ConnectionUpdateListener;
-import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifFile;
import org.apache.directory.studio.ldifeditor.LdifEditorActivator;
import org.apache.directory.studio.ldifeditor.LdifEditorConstants;
@@ -125,7 +126,7 @@
protected IToolBarManager actionToolBarManager;
- private IConnection connection;
+ private IBrowserConnection connection;
private ProjectionSupport projectionSupport;
@@ -236,7 +237,7 @@
super.init( site, input );
- EventRegistry.addConnectionUpdateListener( this, BrowserCommonActivator.getDefault().getEventRunner() );
+ ConnectionEventRegistry.addConnectionUpdateListener( this, ConnectionUIPlugin.getDefault().getEventRunner() );
getSite().getPage().addPartListener( this );
this.valueEditorManager = new ValueEditorManager( getSite().getShell() );
@@ -253,7 +254,7 @@
deactivateGlobalActionHandlers();
- EventRegistry.removeConnectionUpdateListener( this );
+ ConnectionEventRegistry.removeConnectionUpdateListener( this );
getSite().getPage().removePartListener( this );
super.dispose();
@@ -475,7 +476,7 @@
{
public void modifyText( ModifyEvent e )
{
- IConnection connection = BrowserCorePlugin.getDefault().getConnectionManager().getConnection(
+ IBrowserConnection connection = BrowserCorePlugin.getDefault().getConnectionManager().getConnection(
connectionCombo.getText() );
setConnection( connection );
IAction action = getAction( ExecuteLdifAction.class.getName() );
@@ -569,7 +570,7 @@
/**
* {@inheritDoc}
*/
- public IConnection getConnection()
+ public IBrowserConnection getConnection()
{
return this.connection;
}
@@ -581,7 +582,7 @@
* @param connection
* the Connection to set
*/
- private void setConnection( IConnection connection )
+ private void setConnection( IBrowserConnection connection )
{
this.connection = connection;
getEditorSite().getActionBars().getStatusLineManager().setMessage(
@@ -591,22 +592,66 @@
/**
- * {@inheritDoc}
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionUpdated(org.apache.directory.studio.connection.core.Connection)
*/
- public void connectionUpdated( ConnectionUpdateEvent connectionUpdateEvent )
+ public final void connectionUpdated( Connection connection )
{
- IConnection[] connections = BrowserCorePlugin.getDefault().getConnectionManager().getConnections();
+ IBrowserConnection[] connections = BrowserCorePlugin.getDefault().getConnectionManager().getBrowserConnections();
String[] names = new String[connections.length + 1];
names[0] = "";
for ( int i = 0; i < connections.length; i++ )
{
names[i + 1] = connections[i].getName();
}
- String old = this.connectionCombo.getText();
- this.connectionCombo.setItems( names );
- this.connectionCombo.setText( old );
+ String old = connectionCombo.getText();
+ connectionCombo.setItems( names );
+ connectionCombo.setText( old );
connectionCombo.setVisibleItemCount( Math.max( names.length, 20 ) );
+ }
+
+
+ /**
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionAdded(org.apache.directory.studio.connection.core.Connection)
+ */
+ public void connectionAdded( Connection connection )
+ {
+ connectionUpdated( connection );
+ }
+
+
+ /**
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionRemoved(org.apache.directory.studio.connection.core.Connection)
+ */
+ public void connectionRemoved( Connection connection )
+ {
+ connectionUpdated( connection );
+ }
+
+ /**
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionRenamed(org.apache.directory.studio.connection.core.Connection, java.lang.String)
+ */
+ public void connectionRenamed( Connection connection, String oldName )
+ {
+ connectionUpdated( connection );
+ }
+
+
+ /**
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionOpened(org.apache.directory.studio.connection.core.Connection)
+ */
+ public void connectionOpened( Connection connection )
+ {
+ connectionUpdated( connection );
+ }
+
+
+ /**
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionClosed(org.apache.directory.studio.connection.core.Connection)
+ */
+ public void connectionClosed( Connection connection )
+ {
+ connectionUpdated( connection );
}
Modified: directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java (original)
+++ directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java Sun Aug 26 15:36:01 2007
@@ -26,7 +26,7 @@
import org.apache.directory.studio.ldapbrowser.core.internal.model.DummyEntry;
import org.apache.directory.studio.ldapbrowser.core.internal.model.Value;
import org.apache.directory.studio.ldapbrowser.core.model.DN;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.ModelModificationException;
import org.apache.directory.studio.ldapbrowser.core.model.NameException;
import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifPart;
@@ -133,7 +133,7 @@
}
- protected IConnection getConnection()
+ protected IBrowserConnection getConnection()
{
return editor.getConnection() != null ? editor.getConnection() : new DummyConnection( Schema.DEFAULT_SCHEMA );
}
@@ -141,7 +141,7 @@
protected Object getValueEditorRawValue()
{
- IConnection connection = getConnection();
+ IBrowserConnection connection = getConnection();
String dn = getDn();
String description = getAttributeDescription();
Object value = getValue();
Modified: directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java (original)
+++ directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java Sun Aug 26 15:36:01 2007
@@ -26,7 +26,7 @@
import org.apache.directory.studio.ldapbrowser.core.internal.model.DummyConnection;
import org.apache.directory.studio.ldapbrowser.core.internal.model.DummyEntry;
import org.apache.directory.studio.ldapbrowser.core.model.DN;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ModelModificationException;
import org.apache.directory.studio.ldapbrowser.core.model.NameException;
@@ -111,7 +111,7 @@
Schema schema = editor.getConnection() != null ? editor.getConnection().getSchema()
: Schema.DEFAULT_SCHEMA;
- IConnection dummyConnection = new DummyConnection( schema );
+ IBrowserConnection dummyConnection = new DummyConnection( schema );
IEntry dummyEntry = null;
if ( containers[0] instanceof LdifContentRecord )
Modified: directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/OpenBestValueEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/OpenBestValueEditorAction.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/OpenBestValueEditorAction.java (original)
+++ directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/OpenBestValueEditorAction.java Sun Aug 26 15:36:01 2007
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldifeditor.editor.actions;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldifeditor.editor.LdifEditor;
import org.apache.directory.studio.valueeditors.AbstractDialogValueEditor;
import org.apache.directory.studio.valueeditors.IValueEditor;
@@ -41,7 +41,7 @@
super.setEnabled( isEditableLineSelected() );
// determine value editor
- IConnection connection = getConnection();
+ IBrowserConnection connection = getConnection();
String attributeDescription = getAttributeDescription();
if ( attributeDescription != null )
Modified: directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java (original)
+++ directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java Sun Aug 26 15:36:01 2007
@@ -22,7 +22,7 @@
import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifFile;
import org.apache.directory.studio.ldifeditor.editor.ILdifEditor;
import org.apache.directory.studio.ldifeditor.editor.LdifDocumentProvider;
@@ -52,7 +52,7 @@
{
/** The connection. */
- private IConnection connection;
+ private IBrowserConnection connection;
/** The initial LDIF. */
private String initialLdif;
@@ -80,7 +80,7 @@
* @param initialLdif the initial ldif
* @param connection the connection
*/
- public LdifEditorWidget( IConnection connection, String initialLdif, boolean contentAssistEnabled )
+ public LdifEditorWidget( IBrowserConnection connection, String initialLdif, boolean contentAssistEnabled )
{
this.connection = connection;
this.initialLdif = initialLdif;
@@ -158,7 +158,7 @@
/**
* {@inheritDoc}
*/
- public IConnection getConnection()
+ public IBrowserConnection getConnection()
{
return connection;
}
Modified: directory/studio/trunk/studio-valueeditors/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-valueeditors/META-INF/MANIFEST.MF?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-valueeditors/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/studio-valueeditors/META-INF/MANIFEST.MF Sun Aug 26 15:36:01 2007
@@ -8,6 +8,8 @@
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
+ org.apache.directory.studio.connection.core,
+ org.apache.directory.studio.connection.ui,
org.apache.directory.studio.ldapbrowser.core,
org.apache.directory.studio.ldapbrowser.common
Eclipse-LazyStart: true
Modified: directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnDialog.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnDialog.java (original)
+++ directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnDialog.java Sun Aug 26 15:36:01 2007
@@ -26,7 +26,7 @@
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.EntryWidget;
import org.apache.directory.studio.ldapbrowser.core.model.DN;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.valueeditors.ValueEditorsActivator;
import org.apache.directory.studio.valueeditors.ValueEditorsConstants;
import org.eclipse.jface.dialogs.Dialog;
@@ -52,7 +52,7 @@
private EntryWidget entryWidget;
/** The connection. */
- private IConnection connection;
+ private IBrowserConnection connection;
/** The dn. */
private DN dn;
@@ -65,7 +65,7 @@
* @param connection the connection
* @param dn the dn
*/
- public DnDialog( Shell parentShell, IConnection connection, DN dn )
+ public DnDialog( Shell parentShell, IBrowserConnection connection, DN dn )
{
super( parentShell );
super.setShellStyle( super.getShellStyle() | SWT.RESIZE );
Modified: directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java (original)
+++ directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java Sun Aug 26 15:36:01 2007
@@ -24,7 +24,7 @@
import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
import org.apache.directory.studio.ldapbrowser.core.model.DN;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
import org.apache.directory.studio.ldapbrowser.core.model.NameException;
import org.apache.directory.studio.valueeditors.AbstractDialogStringValueEditor;
@@ -91,12 +91,12 @@
}
else if ( attributeHierarchy.size() == 1 && attributeHierarchy.getAttribute().getValueSize() == 0 )
{
- IConnection connection = attributeHierarchy.getAttribute().getEntry().getConnection();
+ IBrowserConnection connection = attributeHierarchy.getAttribute().getEntry().getBrowserConnection();
return new DnValueEditorRawValueWrapper( connection, null );
}
else if ( attributeHierarchy.size() == 1 && attributeHierarchy.getAttribute().getValueSize() == 1 )
{
- IConnection connection = attributeHierarchy.getAttribute().getEntry().getConnection();
+ IBrowserConnection connection = attributeHierarchy.getAttribute().getEntry().getBrowserConnection();
return new DnValueEditorRawValueWrapper( connection, getDisplayValue( attributeHierarchy ) );
}
else
@@ -117,7 +117,7 @@
Object o = super.getRawValue( value );
if ( o != null && o instanceof String )
{
- IConnection connection = value.getAttribute().getEntry().getConnection();
+ IBrowserConnection connection = value.getAttribute().getEntry().getBrowserConnection();
return new DnValueEditorRawValueWrapper( connection, ( String ) o );
}
@@ -135,7 +135,7 @@
private class DnValueEditorRawValueWrapper
{
/** The connection, used in DnDialog to browse for an entry */
- private IConnection connection;
+ private IBrowserConnection connection;
/** The DN, used as initial value in DnDialog */
private String dn;
@@ -147,7 +147,7 @@
* @param connection the connection
* @param dn the DN
*/
- private DnValueEditorRawValueWrapper( IConnection connection, String dn )
+ private DnValueEditorRawValueWrapper( IBrowserConnection connection, String dn )
{
this.connection = connection;
this.dn = dn;
Modified: directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java (original)
+++ directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java Sun Aug 26 15:36:01 2007
@@ -23,7 +23,7 @@
import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
import org.apache.directory.studio.ldapbrowser.core.model.schema.ObjectClassDescription;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
@@ -79,7 +79,7 @@
if ( !showRawValues() && !"".equals( displayValue ) )
{
- Schema schema = value.getAttribute().getEntry().getConnection().getSchema();
+ Schema schema = value.getAttribute().getEntry().getBrowserConnection().getSchema();
ObjectClassDescription ocd = schema.getObjectClassDescription( displayValue );
if ( ocd.isStructural() )
{
@@ -128,12 +128,12 @@
}
else
{
- return getRawValue( value.getAttribute().getEntry().getConnection(), value.getStringValue() );
+ return getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value.getStringValue() );
}
}
- private Object getRawValue( IConnection connection, Object value )
+ private Object getRawValue( IBrowserConnection connection, Object value )
{
Schema schema = null;
if ( connection != null )
Modified: directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java (original)
+++ directory/studio/trunk/studio-valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java Sun Aug 26 15:36:01 2007
@@ -23,10 +23,11 @@
import java.util.Arrays;
-import org.apache.directory.studio.ldapbrowser.common.jobs.RunnableContextJobAdapter;
+import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
+import org.apache.directory.studio.connection.core.jobs.CheckBindJob;
+import org.apache.directory.studio.connection.ui.widgets.RunnableContextJobAdapter;
import org.apache.directory.studio.ldapbrowser.common.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.core.jobs.CheckBindJob;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.Password;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
@@ -485,11 +486,11 @@
{
if ( !"".equals( testPasswordText.getText() ) && entry != null )
{
- IConnection connection = ( IConnection ) entry.getConnection().clone();;
+ Connection connection = ( Connection ) entry.getBrowserConnection().getConnection().clone();
connection.setName( null );
connection.setBindPrincipal( entry.getDn().toString() );
connection.setBindPassword( testPasswordText.getText() );
- connection.setAuthMethod( IConnection.AUTH_SIMPLE );
+ connection.setAuthMethod( AuthenticationMethod.SIMPLE );
CheckBindJob job = new CheckBindJob( connection );
RunnableContextJobAdapter.execute( job );