Changeset 1225

Timestamp:

07/12/08 18:31:43 (6 months ago)

Author:

asterite

Message:

Fixed open type dialog

Files:

• trunk/descent.core/src/descent/internal/core/search/matching/InternalSearchPattern.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/util/TypeInfoLabelProvider.java (modified) (2 diffs)

trunk/descent.core/src/descent/internal/core/search/matching/InternalSearchPattern.java

@@ -60 +60 @@
-    String documentPath(String containerPath, String relativePath) {
-        
-
-new File(containerPath).isAbsolute
+File file = new File(containerPath);
+file.isAbsolute() && file.exists
-        StringBuffer buffer = new StringBuffer(containerPath.length() + separator.length() + relativePath.length());
-        buffer.append(containerPath);

trunk/descent.ui/src/descent/internal/ui/util/TypeInfoLabelProvider.java

@@ -25 +25 @@
-    
-    private static final Image CLASS_ICON= JavaPluginImages.get(JavaPluginImages.IMG_OBJS_CLASS);
-    private static final Image ANNOTATION_ICON= JavaPluginImages.get(JavaPluginImages.IMG_OBJS_ANNOTATION);
-    private static final Image INTERFACE_ICON= JavaPluginImages.get(JavaPluginImages.IMG_OBJS_INTERFACE);
+    private static final Image STRUCT_ICON= JavaPluginImages.get(JavaPluginImages.IMG_OBJS_STRUCT);
+    private static final Image UNION_ICON= JavaPluginImages.get(JavaPluginImages.IMG_OBJS_UNION);
-    private static final Image ENUM_ICON= JavaPluginImages.get(JavaPluginImages.IMG_OBJS_ENUM);
-PACKAG
+MODUL
-    
-    private int fFlags;
@@ -110 +111 @@
-        } else {
-            long modifiers= ((TypeInfo)element).getModifiers();
-            /*
-            if (Flags.isAnnotation(modifiers)) {
-                return ANNOTATION_ICON;
-            } else
-            */ 
-            if (Flags.isEnum(modifiers)) {
-                return ENUM_ICON;
-            } else if (Flags.isInterface(modifiers)) {
-                return INTERFACE_ICON;
+            } else if (Flags.isStruct(modifiers)) {
+                return STRUCT_ICON;
+            } else if (Flags.isUnion(modifiers)) {
+                return UNION_ICON;
-            }
-            return CLASS_ICON;