Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2013-03-13 21:21:03 +0000
committerBrian Vosburgh2013-03-13 21:21:03 +0000
commit04bfc67c41cc7e81d8edc9c7a478c2a442025555 (patch)
treea4d19c93fb9ba9141558ac23b35e05d4d6b73fa8 /jaxb/plugins
parent9ed4fa730401c96e34d5d6dc14cc3de4e3c7c2a2 (diff)
downloadwebtools.dali-04bfc67c41cc7e81d8edc9c7a478c2a442025555.tar.gz
webtools.dali-04bfc67c41cc7e81d8edc9c7a478c2a442025555.tar.xz
webtools.dali-04bfc67c41cc7e81d8edc9c7a478c2a442025555.zip
re-work ItemExtendedLabelProvider.Factory
Diffstat (limited to 'jaxb/plugins')
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorUi.java4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorUi.java4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorItemLabelProviderFactory.java12
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/navigator/JaxbNavigatorUi.java4
6 files changed, 16 insertions, 16 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorUi.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorUi.java
index a11b98d485..6cb81966eb 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorUi.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorUi.java
@@ -9,7 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jaxb.eclipselink.ui.internal.navigator;
-import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
import org.eclipse.jpt.jaxb.ui.internal.jaxb21.GenericJaxb_2_1_NavigatorUi;
@@ -31,7 +31,7 @@ public class ELJaxbNavigatorUi
@Override
- public ItemExtendedLabelProviderFactory getItemLabelProviderFactory() {
+ public ItemExtendedLabelProvider.Factory getItemLabelProviderFactory() {
return ELJaxbNavigatorItemLabelProviderFactory.instance();
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
index c77523fd5e..1e072b08d8 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
import org.eclipse.jpt.common.ui.internal.jface.StaticItemExtendedLabelProvider;
import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider.Factory;
import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant;
import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
@@ -23,7 +23,7 @@ import org.eclipse.jpt.jaxb.ui.JptJaxbUiMessages;
public class GenericJaxb_2_1_NavigatorItemLabelProviderFactory
- implements ItemExtendedLabelProviderFactory {
+ implements ItemExtendedLabelProvider.Factory {
private static GenericJaxb_2_1_NavigatorItemLabelProviderFactory INSTANCE;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorUi.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorUi.java
index d0481c87f5..17eb3ef9da 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorUi.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorUi.java
@@ -9,7 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
-import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
import org.eclipse.jpt.jaxb.ui.navigator.JaxbNavigatorUi;
@@ -37,7 +37,7 @@ public class GenericJaxb_2_1_NavigatorUi
return GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.instance();
}
- public ItemExtendedLabelProviderFactory getItemLabelProviderFactory() {
+ public ItemExtendedLabelProvider.Factory getItemLabelProviderFactory() {
return GenericJaxb_2_1_NavigatorItemLabelProviderFactory.instance();
}
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
index 8f7cecddc3..3d7e7f0fee 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
import org.eclipse.jpt.common.ui.internal.jface.NavigatorContentProvider;
-import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
import org.eclipse.jpt.common.utility.model.event.CollectionAddEvent;
import org.eclipse.jpt.common.utility.model.event.CollectionChangeEvent;
@@ -75,7 +75,7 @@ public class JaxbNavigatorContentProvider
}
@Override
- protected ItemExtendedLabelProviderFactory buildItemLabelProviderFactory() {
+ protected ItemExtendedLabelProvider.Factory buildItemLabelProviderFactory() {
return new JaxbNavigatorItemLabelProviderFactory();
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorItemLabelProviderFactory.java
index c0174bbc60..554c2e9f58 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorItemLabelProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorItemLabelProviderFactory.java
@@ -13,14 +13,14 @@ import java.util.HashMap;
import java.util.Map;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider.Factory;
import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
import org.eclipse.jpt.jaxb.core.platform.JaxbPlatform;
import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig;
import org.eclipse.jpt.jaxb.ui.platform.JaxbPlatformUi;
public class JaxbNavigatorItemLabelProviderFactory
- implements ItemExtendedLabelProviderFactory {
+ implements ItemExtendedLabelProvider.Factory {
/**
* Exactly *one* of these factories is created for each view that utilizes it.
@@ -30,7 +30,7 @@ public class JaxbNavigatorItemLabelProviderFactory
*
* Key: platform description, Value: delegate content provider factory
*/
- private final Map<JaxbPlatformConfig, ItemExtendedLabelProviderFactory> delegates = new HashMap<JaxbPlatformConfig, ItemExtendedLabelProviderFactory>();
+ private final Map<JaxbPlatformConfig, ItemExtendedLabelProvider.Factory> delegates = new HashMap<JaxbPlatformConfig, ItemExtendedLabelProvider.Factory>();
public JaxbNavigatorItemLabelProviderFactory() {
@@ -38,7 +38,7 @@ public class JaxbNavigatorItemLabelProviderFactory
}
public ItemExtendedLabelProvider buildProvider(Object item, ItemExtendedLabelProvider.Manager manager) {
- ItemExtendedLabelProviderFactory delegate = getDelegate(item);
+ ItemExtendedLabelProvider.Factory delegate = getDelegate(item);
if (delegate != null) {
return delegate.buildProvider(item, manager);
}
@@ -46,7 +46,7 @@ public class JaxbNavigatorItemLabelProviderFactory
}
- private ItemExtendedLabelProviderFactory getDelegate(Object element) {
+ private ItemExtendedLabelProvider.Factory getDelegate(Object element) {
if (! (element instanceof IAdaptable)) {
return null;
}
@@ -63,7 +63,7 @@ public class JaxbNavigatorItemLabelProviderFactory
return delegates.get(jaxbPlatformConfig);
}
JaxbPlatformUi platformUi = (JaxbPlatformUi) jaxbPlatform.getAdapter(JaxbPlatformUi.class);
- ItemExtendedLabelProviderFactory delegate =
+ ItemExtendedLabelProvider.Factory delegate =
(platformUi == null) ? null : platformUi.getNavigatorUi().getItemLabelProviderFactory();
delegates.put(jaxbPlatformConfig, delegate);
return delegate;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/navigator/JaxbNavigatorUi.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/navigator/JaxbNavigatorUi.java
index 7e5f1b6f6c..809e76c666 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/navigator/JaxbNavigatorUi.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/navigator/JaxbNavigatorUi.java
@@ -9,7 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jaxb.ui.navigator;
-import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider;
import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
@@ -36,5 +36,5 @@ public interface JaxbNavigatorUi {
/**
* Return the factory to create {@link ItemLabelProvider}s
*/
- ItemExtendedLabelProviderFactory getItemLabelProviderFactory();
+ ItemExtendedLabelProvider.Factory getItemLabelProviderFactory();
}

Back to the top