You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2008/03/12 16:17:29 UTC
svn commit: r636359 [2/2] - in
/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor:
./ controller/actions/ view/ view/dialogs/ view/editors/attributetype/
view/editors/objectclass/ view/editors/schema/ v...
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewLabelProvider.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewLabelProvider.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewLabelProvider.java Wed Mar 12 08:16:59 2008
@@ -28,7 +28,6 @@
import org.apache.directory.studio.schemaeditor.view.wrappers.ProjectWrapper;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -55,22 +54,18 @@
switch ( state )
{
case OPEN:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_OFFLINE ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_PROJECT_OFFLINE );
case CLOSED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_OFFLINE_CLOSED ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_PROJECT_OFFLINE_CLOSED );
}
case ONLINE:
ProjectState state2 = project.getState();
switch ( state2 )
{
case OPEN:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_ONLINE ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_PROJECT_ONLINE );
case CLOSED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_ONLINE_CLOSED ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_PROJECT_ONLINE_CLOSED );
}
}
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java Wed Mar 12 08:16:59 2008
@@ -35,7 +35,6 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -323,18 +322,15 @@
{
if ( element instanceof SchemaWrapper )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA );
}
else if ( element instanceof AttributeTypeWrapper )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_ATTRIBUTE_TYPE )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
else if ( element instanceof ObjectClassWrapper )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_OBJECT_CLASS )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
}
else if ( element instanceof Folder )
{
@@ -343,14 +339,11 @@
switch ( folder.getType() )
{
case ATTRIBUTE_TYPE:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_FOLDER_AT ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_FOLDER_AT );
case OBJECT_CLASS:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_FOLDER_OC ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_FOLDER_OC );
case NONE:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_FOLDER )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_FOLDER );
}
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java Wed Mar 12 08:16:59 2008
@@ -72,7 +72,6 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -254,8 +253,7 @@
// Search Button
searchButton = new Button( searchFieldInnerComposite, SWT.PUSH | SWT.DOWN );
searchButton.setEnabled( false );
- searchButton.setImage( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_SEARCH ).createImage() );
+ searchButton.setImage( Activator.getDefault().getImage( PluginConstants.IMG_SEARCH ) );
searchButton.setToolTipText( "Search" );
searchButton.addSelectionListener( new SelectionAdapter()
{
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java Wed Mar 12 08:16:59 2008
@@ -29,7 +29,6 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -281,13 +280,11 @@
{
if ( element instanceof AttributeTypeImpl )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_ATTRIBUTE_TYPE )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
else if ( element instanceof ObjectClassImpl )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_OBJECT_CLASS )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
}
// Default
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java Wed Mar 12 08:16:59 2008
@@ -40,7 +40,6 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -136,8 +135,7 @@
{
public Image getImage( Object element )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA );
}
} );
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidget.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidget.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidget.java Wed Mar 12 08:16:59 2008
@@ -54,7 +54,6 @@
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -143,8 +142,7 @@
leftToolBar.setLayoutData( new GridData( SWT.RIGHT, SWT.NONE, false, false ) );
// Creating the 'Menu' ToolBar item
final ToolItem leftMenuToolItem = new ToolItem( leftToolBar, SWT.PUSH );
- leftMenuToolItem.setImage( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_TOOLBAR_MENU ).createImage() );
+ leftMenuToolItem.setImage( Activator.getDefault().getImage( PluginConstants.IMG_TOOLBAR_MENU ) );
leftMenuToolItem.setToolTipText( "Menu" );
// Creating the associated Menu
final Menu leftMenu = new Menu( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.POP_UP );
@@ -163,8 +161,7 @@
// Adding the 'Sorting...' MenuItem
MenuItem sortingMenuItem = new MenuItem( leftMenu, SWT.PUSH );
sortingMenuItem.setText( "Sorting..." );
- sortingMenuItem.setImage( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_SORTING ).createImage() );
+ sortingMenuItem.setImage( Activator.getDefault().getImage( PluginConstants.IMG_SORTING ) );
sortingMenuItem.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent arg0 )
@@ -251,8 +248,7 @@
rightToolBar.setLayoutData( new GridData( SWT.RIGHT, SWT.NONE, false, false ) );
// Creating the 'Menu' ToolBar item
final ToolItem rightMenuToolItem = new ToolItem( rightToolBar, SWT.PUSH );
- rightMenuToolItem.setImage( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_TOOLBAR_MENU ).createImage() );
+ rightMenuToolItem.setImage( Activator.getDefault().getImage( PluginConstants.IMG_TOOLBAR_MENU ) );
rightMenuToolItem.setToolTipText( "Menu" );
// Creating the associated Menu
final Menu rightMenu = new Menu( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.POP_UP );
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetPropertiesLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetPropertiesLabelProvider.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetPropertiesLabelProvider.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetPropertiesLabelProvider.java Wed Mar 12 08:16:59 2008
@@ -42,7 +42,6 @@
import org.apache.directory.studio.schemaeditor.model.difference.UsageDifference;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -64,15 +63,12 @@
switch ( propertyDifference.getType() )
{
case ADDED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_PROPERTY_ADD ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_PROPERTY_ADD );
case MODIFIED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_PROPERTY_MODIFY ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_PROPERTY_MODIFY );
case REMOVED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_PROPERTY_REMOVE ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_PROPERTY_REMOVE );
}
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java Wed Mar 12 08:16:59 2008
@@ -32,7 +32,6 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -370,17 +369,13 @@
switch ( sd.getType() )
{
case ADDED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_SCHEMA_ADD ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_SCHEMA_ADD );
case MODIFIED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_SCHEMA_MODIFY ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_SCHEMA_MODIFY );
case REMOVED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_SCHEMA_REMOVE ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_SCHEMA_REMOVE );
case IDENTICAL:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA );
}
}
else if ( element instanceof AttributeTypeDifference )
@@ -389,17 +384,13 @@
switch ( atd.getType() )
{
case ADDED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_ATTRIBUTE_TYPE_ADD ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_ATTRIBUTE_TYPE_ADD );
case MODIFIED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_ATTRIBUTE_TYPE_MODIFY ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_ATTRIBUTE_TYPE_MODIFY );
case REMOVED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_ATTRIBUTE_TYPE_REMOVE ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_ATTRIBUTE_TYPE_REMOVE );
case IDENTICAL:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_ATTRIBUTE_TYPE ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
}
else if ( element instanceof ObjectClassDifference )
@@ -408,17 +399,13 @@
switch ( ocd.getType() )
{
case ADDED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_OBJECT_CLASS_ADD ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_OBJECT_CLASS_ADD );
case MODIFIED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_OBJECT_CLASS_MODIFY ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_OBJECT_CLASS_MODIFY );
case REMOVED:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_DIFFERENCE_OBJECT_CLASS_REMOVE ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_DIFFERENCE_OBJECT_CLASS_REMOVE );
case IDENTICAL:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_OBJECT_CLASS ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
}
}
else if ( element instanceof Folder )
@@ -428,14 +415,11 @@
switch ( folder.getType() )
{
case ATTRIBUTE_TYPE:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_FOLDER_AT ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_FOLDER_AT );
case OBJECT_CLASS:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_FOLDER_OC ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_FOLDER_OC );
case NONE:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_FOLDER )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_FOLDER );
}
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesDifferencesWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesDifferencesWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesDifferencesWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesDifferencesWizardPage.java Wed Mar 12 08:16:59 2008
@@ -29,7 +29,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -55,8 +54,7 @@
super( "CommitChangesDifferencesWizardPage" );
setTitle( "Commit Changes" );
setDescription( "Displays the modifications made on the schema." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_COMMIT_CHANGES_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_COMMIT_CHANGES_WIZARD ) );
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesInformationWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesInformationWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesInformationWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesInformationWizardPage.java Wed Mar 12 08:16:59 2008
@@ -28,7 +28,6 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -52,8 +51,7 @@
super( "CommitChangesInformationWizardPage" );
setTitle( "Commit Changes" );
setDescription( "Please read the following information before committing the changes made on the schema." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_COMMIT_CHANGES_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_COMMIT_CHANGES_WIZARD ) );
}
@@ -77,8 +75,7 @@
// Warning Label
Label warningLabel = new Label( composite, SWT.NONE );
- warningLabel.setImage( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_WARNING_32X32 ).createImage() );
+ warningLabel.setImage( Activator.getDefault().getImage( PluginConstants.IMG_WARNING_32X32 ) );
warningLabel.setLayoutData( new GridData( SWT.CENTER, SWT.BOTTOM, true, true ) );
setControl( composite );
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizardPage.java Wed Mar 12 08:16:59 2008
@@ -51,7 +51,6 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -85,8 +84,7 @@
super( "ExportProjectsWizardPage" );
setTitle( "Export schema projects" );
setDescription( "Please select the schema projects to export." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_EXPORT_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_PROJECT_EXPORT_WIZARD ) );
}
@@ -137,11 +135,9 @@
switch ( type )
{
case OFFLINE:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_OFFLINE_CLOSED ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_PROJECT_OFFLINE_CLOSED );
case ONLINE:
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_ONLINE_CLOSED ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_PROJECT_ONLINE_CLOSED );
}
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizardPage.java Wed Mar 12 08:16:59 2008
@@ -51,7 +51,6 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -88,8 +87,7 @@
super( "ExportSchemasAsOpenLdapWizardPage" );
setTitle( "Export schemas as OpenLdap files" );
setDescription( "Please select the schemas to export as OpenLdap files." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_SCHEMAS_EXPORT_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_EXPORT_WIZARD ) );
schemaHandler = Activator.getDefault().getSchemaHandler();
}
@@ -137,8 +135,7 @@
{
if ( element instanceof Schema )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA );
}
// Default
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizardPage.java Wed Mar 12 08:16:59 2008
@@ -52,7 +52,6 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -97,8 +96,7 @@
super( "ExportSchemasAsXmlWizardPage" );
setTitle( "Export schemas as XML file(s)" );
setDescription( "Please select the schemas to export as XML file(s)." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_SCHEMAS_EXPORT_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_EXPORT_WIZARD ) );
schemaHandler = Activator.getDefault().getSchemaHandler();
}
@@ -146,8 +144,7 @@
{
if ( element instanceof Schema )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA );
}
// Default
@@ -411,7 +408,7 @@
displayErrorMessage( "A Schema Project must be open to export schemas as XML files." );
return;
}
-
+
// Schemas table
if ( schemasTableViewer.getCheckedElements().length == 0 )
{
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizardPage.java Wed Mar 12 08:16:59 2008
@@ -52,7 +52,6 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -97,7 +96,7 @@
super( "ExportSchemasForADSWizardPage" );
setTitle( "Export schemas for Apache DS" );
setDescription( "Please select the schemas to export for Apache DS." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
+ setImageDescriptor( Activator.getDefault().getImageDescriptor(
PluginConstants.IMG_SCHEMAS_EXPORT_FOR_ADS_WIZARD ) );
schemaHandler = Activator.getDefault().getSchemaHandler();
}
@@ -146,8 +145,7 @@
{
if ( element instanceof Schema )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA );
}
// Default
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizardPage.java Wed Mar 12 08:16:59 2008
@@ -31,7 +31,6 @@
import org.apache.directory.studio.schemaeditor.view.widget.CoreSchemasSelectionWidget.ServerTypeEnum;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -56,8 +55,7 @@
super( "ImportCoreSchemasWizardPage" );
setTitle( "Import core schemas" );
setDescription( "Please select the 'core' schemas to import." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_SCHEMAS_IMPORT_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_IMPORT_WIZARD ) );
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizardPage.java Wed Mar 12 08:16:59 2008
@@ -47,7 +47,6 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -77,8 +76,7 @@
super( "ImportProjectsWizardPage" );
setTitle( "Import schema projects" );
setDescription( "Please select the schema project to import." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_IMPORT_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_PROJECT_IMPORT_WIZARD ) );
}
@@ -150,8 +148,7 @@
{
if ( element instanceof File )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_FILE ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_PROJECT_FILE );
}
// Default
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizardPage.java Wed Mar 12 08:16:59 2008
@@ -47,7 +47,6 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -77,8 +76,7 @@
super( "ImportSchemasFromOpenLdapWizardPage" );
setTitle( "Import schemas from OpenLdap files" );
setDescription( "Please select the OpenLdap schema files to import." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_SCHEMAS_IMPORT_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_IMPORT_WIZARD ) );
}
@@ -150,8 +148,7 @@
{
if ( element instanceof File )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA );
}
// Default
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizardPage.java Wed Mar 12 08:16:59 2008
@@ -47,7 +47,6 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -77,8 +76,7 @@
super( "ImportSchemasFromXmlWizardPage" );
setTitle( "Import schemas from XML file(s)" );
setDescription( "Please select the XML schema files to import." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_SCHEMAS_IMPORT_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_IMPORT_WIZARD ) );
}
@@ -150,8 +148,7 @@
{
if ( element instanceof File )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA )
- .createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA );
}
// Default
@@ -275,7 +272,7 @@
displayErrorMessage( "A Schema Project must be open to import schemas from XML files." );
return;
}
-
+
// Export Directory
String directory = fromDirectoryText.getText();
if ( ( directory == null ) || ( directory.equals( "" ) ) )
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java Wed Mar 12 08:16:59 2008
@@ -51,7 +51,6 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Spinner;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -94,8 +93,7 @@
super( "NewAttributeTypeContentWizardPage" );
setTitle( "Attribute Type Content" );
setDescription( "Please enter the superior, usage, syntax and properties for the attribute type." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_ATTRIBUTE_TYPE_NEW_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_ATTRIBUTE_TYPE_NEW_WIZARD ) );
schemaHandler = Activator.getDefault().getSchemaHandler();
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java Wed Mar 12 08:16:59 2008
@@ -58,7 +58,6 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -97,8 +96,7 @@
super( "NewAttributeTypeGeneralWizardPage" );
setTitle( "Attribute Type" );
setDescription( "Create a new attribute type." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_ATTRIBUTE_TYPE_NEW_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_ATTRIBUTE_TYPE_NEW_WIZARD ) );
schemaHandler = Activator.getDefault().getSchemaHandler();
aliases = new ArrayList<Alias>();
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java Wed Mar 12 08:16:59 2008
@@ -41,7 +41,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -99,8 +98,7 @@
super( "NewAttributeTypeMatchingRulesWizardPage" );
setTitle( "Matching Rules" );
setDescription( "Please specify the matching rules (equality, ordering and substring) to use for the attribute type." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_ATTRIBUTE_TYPE_NEW_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_ATTRIBUTE_TYPE_NEW_WIZARD ) );
schemaHandler = Activator.getDefault().getSchemaHandler();
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java Wed Mar 12 08:16:59 2008
@@ -50,7 +50,6 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -88,8 +87,7 @@
super( "NewObjectClassContentWizardPage" );
setTitle( "Object Class Content" );
setDescription( "Please enter the superiors, class type and properties for the object class." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
superiorsList = new ArrayList<ObjectClassImpl>();
}
@@ -121,8 +119,7 @@
{
if ( element instanceof ObjectClassImpl )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_OBJECT_CLASS ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
}
// Default
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java Wed Mar 12 08:16:59 2008
@@ -58,7 +58,6 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -97,8 +96,7 @@
super( "NewObjectClassGeneralPageWizardPage" );
setTitle( "Object Class" );
setDescription( "Create a new object class." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
schemaHandler = Activator.getDefault().getSchemaHandler();
aliases = new ArrayList<Alias>();
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java Wed Mar 12 08:16:59 2008
@@ -48,7 +48,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -78,8 +77,7 @@
super( "NewObjectClassMandatoryAttributesPage" );
setTitle( "Mandatory Attribute Types" );
setDescription( "Please specify the mandatory attribute types for the object class." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
mandatoryAttributeTypesList = new ArrayList<AttributeTypeImpl>();
}
@@ -112,8 +110,7 @@
{
if ( element instanceof AttributeTypeImpl )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_ATTRIBUTE_TYPE ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
// Default
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java Wed Mar 12 08:16:59 2008
@@ -48,7 +48,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -78,8 +77,7 @@
super( "NewObjectClassOptionalAttributesPage" );
setTitle( "Optional Attribute Types" );
setDescription( "Please specify the optional attribute types for the object class." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
optionalAttributeTypesList = new ArrayList<AttributeTypeImpl>();
}
@@ -112,8 +110,7 @@
{
if ( element instanceof AttributeTypeImpl )
{
- return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_ATTRIBUTE_TYPE ).createImage();
+ return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
// Default
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java Wed Mar 12 08:16:59 2008
@@ -37,7 +37,6 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -66,8 +65,7 @@
super( "NewProjectWizardConnectionSelectionPage" );
setTitle( "Create a Schema project." );
setDescription( "Please select a connection." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_NEW_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_PROJECT_NEW_WIZARD ) );
setPageComplete( false );
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java Wed Mar 12 08:16:59 2008
@@ -33,7 +33,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -63,8 +62,7 @@
super( "NewProjectWizardInformationPage" );
setTitle( "Create a Schema project." );
setDescription( "Please specify a name and a type to create a new Schema project." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_NEW_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_PROJECT_NEW_WIZARD ) );
projectsHandler = Activator.getDefault().getProjectsHandler();
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardSchemasSelectionPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardSchemasSelectionPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardSchemasSelectionPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardSchemasSelectionPage.java Wed Mar 12 08:16:59 2008
@@ -26,7 +26,6 @@
import org.apache.directory.studio.schemaeditor.view.widget.CoreSchemasSelectionWidget.ServerTypeEnum;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -51,8 +50,7 @@
super( "NewProjectWizardSchemasSelectionPage" );
setTitle( "Create a Schema project." );
setDescription( "Please select the 'core' schemas to include in the project." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_PROJECT_NEW_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_PROJECT_NEW_WIZARD ) );
}
Modified: directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizardPage.java?rev=636359&r1=636358&r2=636359&view=diff
==============================================================================
--- directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizardPage.java (original)
+++ directory/studio/branches/1.1.0/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizardPage.java Wed Mar 12 08:16:59 2008
@@ -31,7 +31,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
@@ -59,8 +58,7 @@
super( "NewSchemaWizardPage" );
setTitle( "Create a Schema" );
setDescription( "Please specify a name to create a new schema." );
- setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
- PluginConstants.IMG_SCHEMA_NEW_WIZARD ) );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMA_NEW_WIZARD ) );
schemaHandler = Activator.getDefault().getSchemaHandler();
}