Changeset 7741

Timestamp:

2004-07-16T13:56:32+12:00 (20 years ago)

Author:

davidb

Message:

Images are now located through Utility class. This means that images
present in a Jar file will be located (if present) and used. Needed
to support GLI as an applet.

Location:

trunk/gli/src/org/greenstone/gatherer/feedback

Files:

• ActionRecorderDialog.java (modified) (9 diffs)
• SelectPicture.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/feedback/ActionRecorderDialog.java

@@ -15 +15 @@
 import javax.swing.border.*;
 import java.text.*;
+
+import org.greenstone.gatherer.util.Utility;
 
 /**
@@ -475 +477 @@
     ImageIcon icon,icon2,icon3;
 
-    icon3 = new ImageIcon(ClassLoader.getSystemResource("images/fastsend.gif"));
+    icon3 = Utility.getImage("fastsend.gif");
     item3 = new JMenuItem(messages.getString("SendFeedback"), 
                   new ImageIcon(icon3.getImage().getScaledInstance
@@ -489 +491 @@
     if (rec == false)
         {
-        icon = new ImageIcon(ClassLoader.getSystemResource("images/feedback.gif"));
+        icon = Utility.getImage("feedback.gif");
         item = new JMenuItem("Report Feedback",
                      new ImageIcon(icon.getImage().getScaledInstance
@@ -501 +503 @@
     else
         {
-        icon = new ImageIcon(ClassLoader.getSystemResource("images/camera.gif"));
+        icon = Utility.getImage("camera.gif");
         item = new JMenuItem(messages.getString("ScreenShot"),
                      new ImageIcon(icon.getImage().getScaledInstance
@@ -512 +514 @@
         }
 
-    icon2 = new ImageIcon(ClassLoader.getSystemResource("images/history.gif"));
+    icon2 = Utility.getImage("history.gif");
     item2 = new JMenuItem(messages.getString("LookHistory"),
                   new ImageIcon(icon2.getImage().getScaledInstance
@@ -588 +590 @@
             JMenuItem item;
             ImageIcon icon;
-            icon = new ImageIcon(ClassLoader.getSystemResource
-                     ("images/camera.gif"));
+            icon = Utility.getImage("camera.gif");
             item = new JMenuItem(messages.getString("ScreenShot"),
                      new ImageIcon(icon.getImage().getScaledInstance
@@ -622 +623 @@
             JMenuItem item;
             ImageIcon icon;
-            icon = new ImageIcon(ClassLoader.getSystemResource
-                     ("images/camera.gif"));
+            icon = Utility.getImage("camera.gif");
             item = new JMenuItem(messages.getString("ScreenShot"),
                      new ImageIcon(icon.getImage().getScaledInstance
@@ -671 +671 @@
             JMenuItem item;
             
-            icon = new ImageIcon(ClassLoader.getSystemResource("images/feedback.gif"));
+            icon = Utility.getImage("feedback.gif");
             item = new JMenuItem("Report Feedback", new ImageIcon(icon.getImage().getScaledInstance(20,20,Image.SCALE_SMOOTH)));
             item.setActionCommand(messages.getString("SendFeedback"));
@@ -702 +702 @@
             JMenuItem item;
             
-            icon = new ImageIcon(ClassLoader.getSystemResource("images/feedback.gif"));
+            icon = Utility.getImage("feedback.gif");
             item = new JMenuItem("Report Feedback", new ImageIcon(icon.getImage().getScaledInstance(20,20,Image.SCALE_SMOOTH)));
             item.setActionCommand(messages.getString("SendFeedback"));

trunk/gli/src/org/greenstone/gatherer/feedback/SelectPicture.java

@@ -19 +19 @@
 import javax.swing.BorderFactory;
 
+import org.greenstone.gatherer.util.Utility;
+
 /**
  * This class allows user to make scribble lines in the image.
@@ -342 +344 @@
                 new EmptyBorder(10,10,10,10)));
        
+        ImageIcon imgicon,imgicon2;
         Image img,img2;
-        img = getToolkit().getImage(ClassLoader.getSystemResource("images/pen.gif"));
+        imgicon = Utility.getImage("pen.gif");
+        img = imgicon.getImage();
         img = img.getScaledInstance(24,24,Image.SCALE_SMOOTH);
-        img2 = getToolkit().getImage(ClassLoader.getSystemResource("images/eraserpen.gif"));
+        imgicon2 = Utility.getImage("eraserpen.gif");
+        img2 = imgicon2.getImage();
         final Cursor cursor;
         final Cursor cursor2;
@@ -467 +472 @@
 
         JButton pen;
-        pen = new JButton(new ImageIcon
-        (ClassLoader.getSystemResource("images/penicon.gif")));
+        pen = new JButton(Utility.getImage("penicon.gif"));
         pen.setText("Pen");
         pen.setPreferredSize(new Dimension(30,20));
@@ -485 +489 @@
 
         JButton eraser;
-        eraser = new JButton(new ImageIcon
-        (ClassLoader.getSystemResource("images/eraser.gif")));
+        eraser = new JButton(Utility.getImage("eraser.gif"));
         eraser.setText("Eraser");
         eraser.setActionCommand("Eraser");