Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/applet

Timestamp:

2012-05-22T13:01:04+12:00 (12 years ago)

Author:

sjm84

Message:

Fixing Greenstone 3's use (or lack thereof) of generics, this was done automatically so we may want to change it over time. This change will also auto-format any files that have not already been formatted.

File:

• main/trunk/greenstone3/src/java/org/greenstone/applet/phind/ResultCanvas.java (modified) (9 diffs)

main/trunk/greenstone3/src/java/org/greenstone/applet/phind/ResultCanvas.java

@@ -76 +76 @@
     int firstItemDisplayed;
     int itemSelected;
-    Vector items;
+    Vector<ResultItem> items;
     
     // the background image
@@ -95 +95 @@
     lineSpacing = phind.fontSize + 2;
 
-    items = new Vector();
+    items = new Vector<ResultItem>();
     numberOfItems = 0;
     firstItemDisplayed = 0;
@@ -132 +132 @@
     int index = 0;
     while ((index < numberOfItems) &&
-           ((item.sort < ((ResultItem) items.elementAt(index)).sort) ||
-        ((item.sort == ((ResultItem) items.elementAt(index)).sort) &&
-         (item.frequency <= ((ResultItem) items.elementAt(index)).frequency)))) {
+           ((item.sort < items.elementAt(index).sort) ||
+        ((item.sort == items.elementAt(index).sort) &&
+         (item.frequency <= items.elementAt(index).frequency)))) {
         index++;
     }
@@ -160 +160 @@
     int index = 0;
     while (!found && (index < numberOfItems)) {
-        if (((ResultItem) items.elementAt(index)).isMorePhrases()) {
+        if (items.elementAt(index).isMorePhrases()) {
         found = true;
         } else {
@@ -192 +192 @@
     int index = 0;
     while (!found && (index < numberOfItems)) {
-        if (((ResultItem) items.elementAt(index)).isMoreDocuments()) {
+        if (items.elementAt(index).isMoreDocuments()) {
         found = true;
         } else {
@@ -225 +225 @@
     int index = 0;
     while (!found && (index < numberOfItems)) {
-        if (((ResultItem) items.elementAt(index)).isMoreLinks()) {
+        if (items.elementAt(index).isMoreLinks()) {
         found = true;
         } else {
@@ -332 +332 @@
 
         // Get the resultItem to output
-        result = (ResultItem) items.elementAt(i);
+        result = items.elementAt(i);
         
         // Graphics settings for drawing this line
@@ -436 +436 @@
         
         // Get the resultItem to output
-        result = (ResultItem) items.elementAt(i);
+        result = items.elementAt(i);
         docsText = result.docsText();
         freqText = result.freqText();
@@ -495 +495 @@
     int rowSelected = event.getY() / lineSpacing;
     itemSelected = rowSelected + firstItemDisplayed;
-    ResultItem item = (ResultItem) items.elementAt(itemSelected);
+    ResultItem item = items.elementAt(itemSelected);
 
     if (itemSelected <= numberOfItems) {