Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Fullbright2013-05-03 17:20:18 +0000
committerPaul Fullbright2013-05-07 17:58:00 +0000
commit8d6b440159f7b41ed8a76af5dd19df59ab743f7e (patch)
tree26b7bc5e80cdbf0022899b73e05e4c5d7c6e9462
parent256c8b30047581eef567a1325d124422fb984540 (diff)
downloadwebtools.dali-8d6b440159f7b41ed8a76af5dd19df59ab743f7e.tar.gz
webtools.dali-8d6b440159f7b41ed8a76af5dd19df59ab743f7e.tar.xz
webtools.dali-8d6b440159f7b41ed8a76af5dd19df59ab743f7e.zip
added converter icon, reverted null type mapping icon
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/converter.icobin0 -> 1150 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/converter.pngbin0 -> 640 bytes
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiImages.java1
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/JavaConverterTypeUiDefinition2_1.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/ManagedTypeItemLabelProvider.java2
8 files changed, 12 insertions, 11 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java
index d3a5bb1265..6b70a8ff26 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java
@@ -56,9 +56,9 @@ public class JavaNullTypeMapping
/**
* We added this message here because the most likely solution is to add
* an annotation to the .java file.
- * This message used to be found on the <class> tag in persistence.xml.
- * The other possible way to fix the error is to remove it from persistence.xml.
- * This can be accomplished with the Synchronize Classes action.
+ * However, this message can also be found on the <class> tag in persistence.xml, as
+ * this error may also be fixed by removing the class from the persistence.xml
+ * or synchronizing classes.
* We could also add a quick fix for this error.
*/
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/converter.ico b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/converter.ico
new file mode 100644
index 0000000000..1b9e8b3290
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/converter.ico
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/converter.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/converter.png
new file mode 100644
index 0000000000..dbe71bad91
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/converter.png
Binary files differ
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiImages.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiImages.java
index 77ccd7a484..d5bb011f4c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiImages.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiImages.java
@@ -83,6 +83,7 @@ public final class JptJpaUiImages {
public static final ImageDescriptor EMBEDDABLE = buildImageDescriptor(OBJECTS_ + "embeddable.gif");
public static final ImageDescriptor MAPPED_SUPERCLASS = buildImageDescriptor(OBJECTS_ + "mapped-superclass.gif");
public static final ImageDescriptor NULL_TYPE_MAPPING = buildImageDescriptor(OBJECTS_ + "java-class.gif");
+ public static final ImageDescriptor CONVERTER = buildImageDescriptor(OBJECTS_ + "converter.png");
public static final ImageDescriptor ID = buildImageDescriptor(OBJECTS_ + "id.gif");
public static final ImageDescriptor EMBEDDED_ID = buildImageDescriptor(OBJECTS_ + "embedded-id.gif");
public static final ImageDescriptor BASIC = buildImageDescriptor(OBJECTS_ + "basic.gif");
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java
index 4a287445c0..1d659f4a48 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java
@@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.ui.internal.details.java;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ResourceManager;
-import org.eclipse.jpt.common.ui.JptCommonUiImages;
import org.eclipse.jpt.common.ui.WidgetFactory;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.jpa.core.MappingKeys;
import org.eclipse.jpt.jpa.core.context.JpaContextModel;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.details.JpaComposite;
import org.eclipse.jpt.jpa.ui.details.JpaUiFactory;
@@ -71,7 +71,7 @@ public class NullJavaTypeMappingUiDefinition
@Override
public ImageDescriptor getImageDescriptor() {
- return JptCommonUiImages.WARNING;
+ return JptJpaUiImages.NULL_TYPE_MAPPING;
}
public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextModel> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/JavaConverterTypeUiDefinition2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/JavaConverterTypeUiDefinition2_1.java
index 7fb38e00f1..dd4ae1c0c1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/JavaConverterTypeUiDefinition2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/JavaConverterTypeUiDefinition2_1.java
@@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2_1;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jpt.jpa.core.context.java.JavaManagedType;
import org.eclipse.jpt.jpa.core.jpa2_1.context.java.JavaConverterType2_1;
-import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
import org.eclipse.jpt.jpa.ui.JavaManagedTypeUiDefinition;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
public class JavaConverterTypeUiDefinition2_1
implements JavaManagedTypeUiDefinition
@@ -43,6 +43,6 @@ public class JavaConverterTypeUiDefinition2_1
}
public ImageDescriptor getImageDescriptor(JavaManagedType managedType) {
- return JptJpaUiImages.CLASS_REF;
+ return JptJpaUiImages.CONVERTER;
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java
index 249df907ad..575abdc442 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java
@@ -19,7 +19,6 @@ import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.window.Window;
-import org.eclipse.jpt.common.ui.JptCommonUiImages;
import org.eclipse.jpt.common.ui.JptCommonUiMessages;
import org.eclipse.jpt.common.ui.internal.jface.ResourceManagerLabelProvider;
import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
@@ -44,6 +43,7 @@ import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
import org.eclipse.jpt.jpa.ui.JavaManagedTypeUiDefinition;
import org.eclipse.jpt.jpa.ui.JpaPlatformUi;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
import org.eclipse.jpt.jpa.ui.PersistenceResourceUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
@@ -218,12 +218,12 @@ public class PersistenceUnitClassesComposite
private ImageDescriptor getImageDescriptor(ClassRef classRef) {
if (classRef.getJavaManagedType() == null) {
- return JptCommonUiImages.WARNING;
+ return JptJpaUiImages.NULL_TYPE_MAPPING;
}
JavaManagedTypeUiDefinition def = this.getManagedTypeUiDefinition(classRef);
return (def != null) ?
def.getImageDescriptor(classRef.getJavaManagedType()) :
- JptCommonUiImages.WARNING;
+ JptJpaUiImages.NULL_TYPE_MAPPING;
}
private JavaManagedTypeUiDefinition getManagedTypeUiDefinition(ClassRef classRef) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/ManagedTypeItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/ManagedTypeItemLabelProvider.java
index 8fe6820e08..0937215da1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/ManagedTypeItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/ManagedTypeItemLabelProvider.java
@@ -29,7 +29,7 @@ public class ManagedTypeItemLabelProvider
@Override
protected ImageDescriptor getImageDescriptor() {
- return JptJpaUiImages.CLASS_REF;
+ return JptJpaUiImages.CONVERTER;
}

Back to the top