Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2013-03-13 21:33:09 +0000
committerBrian Vosburgh2013-03-13 21:33:09 +0000
commita1e217f4405875c351b8484d9cfbc4a792045f06 (patch)
treef23eea1c4ce928fc1f63ed3185df07ff80fdef84 /jaxb/plugins
parent956cc39eb58e6f0c99425af168ae17450689cb5f (diff)
downloadwebtools.dali-a1e217f4405875c351b8484d9cfbc4a792045f06.tar.gz
webtools.dali-a1e217f4405875c351b8484d9cfbc4a792045f06.tar.xz
webtools.dali-a1e217f4405875c351b8484d9cfbc4a792045f06.zip
re-work ItemTreeContentProvider.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.java6
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java9
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorUi.java6
-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/JaxbNavigatorTreeItemContentProviderFactory.java11
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/navigator/JaxbNavigatorUi.java5
6 files changed, 19 insertions, 22 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 6cb81966eb..58cda71c14 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,7 +10,7 @@
package org.eclipse.jpt.jaxb.eclipselink.ui.internal.navigator;
import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
+import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider;
import org.eclipse.jpt.jaxb.ui.internal.jaxb21.GenericJaxb_2_1_NavigatorUi;
@@ -36,7 +36,7 @@ public class ELJaxbNavigatorUi
}
@Override
- public ItemTreeContentProviderFactory getTreeItemContentProviderFactory() {
+ public ItemTreeContentProvider.Factory getTreeItemContentProviderFactory() {
return ELJaxbNavigatorTreeItemContentProviderFactory.instance();
}
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java
index 698b7028e2..b81bc4326e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -11,7 +11,6 @@ package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider;
import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider.Manager;
-import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
import org.eclipse.jpt.jaxb.core.context.java.JavaClass;
@@ -21,15 +20,15 @@ import org.eclipse.jpt.jaxb.core.context.java.JavaEnum;
*
*/
public class GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory
- implements ItemTreeContentProviderFactory
+ implements ItemTreeContentProvider.Factory
{
// singleton
- private static final ItemTreeContentProviderFactory INSTANCE = new GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory();
+ private static final ItemTreeContentProvider.Factory INSTANCE = new GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory();
/**
* Return the singleton
*/
- public static ItemTreeContentProviderFactory instance() {
+ public static ItemTreeContentProvider.Factory instance() {
return 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 17eb3ef9da..988b096aee 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,7 +10,7 @@
package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
+import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider;
import org.eclipse.jpt.jaxb.ui.navigator.JaxbNavigatorUi;
@@ -33,7 +33,7 @@ public class GenericJaxb_2_1_NavigatorUi
}
- public ItemTreeContentProviderFactory getTreeItemContentProviderFactory() {
+ public ItemTreeContentProvider.Factory getTreeItemContentProviderFactory() {
return GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.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 3d7e7f0fee..77d7208377 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
@@ -23,7 +23,7 @@ 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.ItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
+import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider;
import org.eclipse.jpt.common.utility.model.event.CollectionAddEvent;
import org.eclipse.jpt.common.utility.model.event.CollectionChangeEvent;
import org.eclipse.jpt.common.utility.model.event.CollectionClearEvent;
@@ -70,7 +70,7 @@ public class JaxbNavigatorContentProvider
}
@Override
- protected ItemTreeContentProviderFactory buildItemContentProviderFactory() {
+ protected ItemTreeContentProvider.Factory buildItemContentProviderFactory() {
return new JaxbNavigatorTreeItemContentProviderFactory();
}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorTreeItemContentProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorTreeItemContentProviderFactory.java
index c21ce827a5..b9701ca510 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorTreeItemContentProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorTreeItemContentProviderFactory.java
@@ -12,14 +12,13 @@ package org.eclipse.jpt.jaxb.ui.internal.navigator;
import java.util.HashMap;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider;
-import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
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 JaxbNavigatorTreeItemContentProviderFactory
- implements ItemTreeContentProviderFactory
+ implements ItemTreeContentProvider.Factory
{
/**
* Exactly *one* of these factories is created for each view that utilizes it.
@@ -29,7 +28,7 @@ public class JaxbNavigatorTreeItemContentProviderFactory
*
* Key: platform id, Value: delegate content provider factory
*/
- private HashMap<JaxbPlatformConfig, ItemTreeContentProviderFactory> delegates = new HashMap<JaxbPlatformConfig, ItemTreeContentProviderFactory>();
+ private HashMap<JaxbPlatformConfig, ItemTreeContentProvider.Factory> delegates = new HashMap<JaxbPlatformConfig, ItemTreeContentProvider.Factory>();
public JaxbNavigatorTreeItemContentProviderFactory() {
@@ -37,7 +36,7 @@ public class JaxbNavigatorTreeItemContentProviderFactory
}
public ItemTreeContentProvider buildProvider(Object item, ItemTreeContentProvider.Manager manager) {
- ItemTreeContentProviderFactory delegate = getDelegate(item);
+ ItemTreeContentProvider.Factory delegate = getDelegate(item);
if (delegate != null) {
return delegate.buildProvider(item, manager);
}
@@ -45,7 +44,7 @@ public class JaxbNavigatorTreeItemContentProviderFactory
}
- private ItemTreeContentProviderFactory getDelegate(Object element) {
+ private ItemTreeContentProvider.Factory getDelegate(Object element) {
if (! (element instanceof IAdaptable)) {
return null;
}
@@ -62,7 +61,7 @@ public class JaxbNavigatorTreeItemContentProviderFactory
return delegates.get(jaxbPlatformConfig);
}
JaxbPlatformUi platformUi = (JaxbPlatformUi) jaxbPlatform.getAdapter(JaxbPlatformUi.class);
- ItemTreeContentProviderFactory delegate =
+ ItemTreeContentProvider.Factory delegate =
(platformUi == null) ? null : platformUi.getNavigatorUi().getTreeItemContentProviderFactory();
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 809e76c666..6ba8084a09 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jaxb.ui.navigator;
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;
/**
* Defines content and label provider factories for Project Navigator view for a given JAXB project.
@@ -31,7 +30,7 @@ public interface JaxbNavigatorUi {
/**
* Return the factory to create {@link ItemTreeContentProvider}s
*/
- ItemTreeContentProviderFactory getTreeItemContentProviderFactory();
+ ItemTreeContentProvider.Factory getTreeItemContentProviderFactory();
/**
* Return the factory to create {@link ItemLabelProvider}s

Back to the top