[jsword-svn] r1028 - in trunk/biblemapper: .settings
src/main/java/org/crosswire/biblemapper/model
src/main/java/org/crosswire/biblemapper/swing
src/test/java/org/crosswire/biblemapper/model
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Mar 5 04:57:47 MST 2006
Author: dmsmith
Date: 2006-03-05 04:57:25 -0700 (Sun, 05 Mar 2006)
New Revision: 1028
Modified:
trunk/biblemapper/.settings/org.eclipse.jdt.core.prefs
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/AntiGravityRule.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/FrictionRule.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Link.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookChooser.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/ExtensionFileFilter.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/GroupVerseColor.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapperPane.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/RainbowVerseColor.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/SectionVerseColor.java
trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/AntiGravityRuleTest.java
trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/LinkArrayTest.java
trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/MapTest.java
Log:
Updated to Java 5
Modified: trunk/biblemapper/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/biblemapper/.settings/org.eclipse.jdt.core.prefs 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/.settings/org.eclipse.jdt.core.prefs 2006-03-05 11:57:25 UTC (rev 1028)
@@ -1,4 +1,4 @@
-#Thu Mar 02 07:48:22 EST 2006
+#Sat Mar 04 11:20:01 EST 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -17,6 +17,7 @@
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
@@ -28,6 +29,7 @@
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -35,12 +37,14 @@
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
@@ -50,9 +54,9 @@
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/AntiGravityRule.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/AntiGravityRule.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/AntiGravityRule.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -121,10 +121,7 @@
{
return (float) -Math.exp(-idist*STRENGTH) / 2;
}
- else
- {
- return (float) Math.exp(idist*STRENGTH) / 2;
- }
+ return (float) Math.exp(idist*STRENGTH) / 2;
}
/**
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/FrictionRule.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/FrictionRule.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/FrictionRule.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -41,7 +41,8 @@
/**
* @see org.crosswire.biblemapper.model.AbstractRule#setScale(int)
*/
- public void setScale(int scale)
+ @Override
+ public void setScale(int scale)
{
if (scale == 0)
{
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Link.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Link.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Link.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -77,6 +77,7 @@
/**
* Simple bit of debug
*/
+ @Override
public String toString()
{
try
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -37,6 +37,7 @@
import org.crosswire.jsword.passage.PassageTally;
import org.crosswire.jsword.passage.Verse;
import org.crosswire.jsword.passage.VerseRange;
+import org.jdom.Content;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -125,9 +126,9 @@
Element ec = (Element) cit.next();
int c = Integer.parseInt(ec.getAttributeValue("num"));
- List ls = new ArrayList();
+ List<Link> ls = new ArrayList<Link>();
- List els = ec.getChildren("link");
+ List<Content> els = ec.getChildren("link");
Iterator lit = els.iterator();
while (lit.hasNext())
{
@@ -139,7 +140,7 @@
ls.add(l);
}
- links[b][c] = (Link[]) ls.toArray(new Link[ls.size()]);
+ links[b][c] = ls.toArray(new Link[ls.size()]);
}
}
}
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookChooser.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookChooser.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookChooser.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -145,6 +145,7 @@
dialog.setLocationRelativeTo(parent);
dialog.addWindowListener(new WindowAdapter()
{
+ @Override
public void windowClosed(WindowEvent ev)
{
cancelPressed();
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -75,10 +75,7 @@
{
return Color.gray;
}
- else
- {
- return Color.red;
- }
+ return Color.red;
}
/**
@@ -102,6 +99,7 @@
/**
* The name for display in a combo box
*/
+ @Override
public String toString()
{
try
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/ExtensionFileFilter.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/ExtensionFileFilter.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/ExtensionFileFilter.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -58,6 +58,7 @@
* Is the given file valid?
* @param file The object to test
*/
+ @Override
public boolean accept(File file)
{
if (file.isDirectory())
@@ -81,6 +82,7 @@
/**
*
*/
+ @Override
public String getDescription()
{
if (desc != null)
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/GroupVerseColor.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/GroupVerseColor.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/GroupVerseColor.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -68,6 +68,7 @@
/**
* The name for display in a combo box
*/
+ @Override
public String toString()
{
return "Groups";
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -121,6 +121,7 @@
* @param col The index of column
* @return the name of the column
*/
+ @Override
public String getColumnName(int col)
{
switch (col)
@@ -147,7 +148,8 @@
* by the table to set up a default renderer and editor for the column.
* @return the common ancestor class of the object values in the model.
*/
- public Class getColumnClass(int col)
+ @Override
+ public Class<?> getColumnClass(int col)
{
switch (col)
{
@@ -170,6 +172,7 @@
* @return rue if the cell is editable.
* @see #setValueAt(Object, int, int)
*/
+ @Override
public boolean isCellEditable(int row, int col)
{
return col > 2;
@@ -244,6 +247,7 @@
* @see #getValueAt(int, int)
* @see #isCellEditable(int, int)
*/
+ @Override
public void setValueAt(Object val, int row, int col)
{
try
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -475,6 +475,7 @@
this.addWindowListener(new WindowAdapter()
{
+ @Override
public void windowClosed(WindowEvent ev)
{
exit();
@@ -539,10 +540,7 @@
return reply == JOptionPane.YES_OPTION;
}
- else
- {
- return true;
- }
+ return true;
}
/**
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapperPane.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapperPane.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapperPane.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -136,6 +136,7 @@
* Paint the map
* @param g The graphics instance to paint with
*/
+ @Override
public void paintComponent(Graphics g)
{
g.setColor(versecolor.getBackground());
@@ -239,6 +240,7 @@
* The size of this map
* public void reshape(int x, int y, int w, int h)
*/
+ @Override
public void setSize(Dimension x)
{
if (lock_aspect)
@@ -276,10 +278,7 @@
{
return getWidth() / 60;
}
- else
- {
- return getHeight() / 60;
- }
+ return getHeight() / 60;
}
/**
@@ -297,10 +296,7 @@
{
return getWidth() / 6;
}
- else
- {
- return getHeight() / 6;
- }
+ return getHeight() / 6;
}
/**
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/RainbowVerseColor.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/RainbowVerseColor.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/RainbowVerseColor.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -89,6 +89,7 @@
/**
* The name for display in a combo box
*/
+ @Override
public String toString()
{
return "Rainbow";
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/SectionVerseColor.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/SectionVerseColor.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/SectionVerseColor.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -75,10 +75,7 @@
{
return Color.gray;
}
- else
- {
- return Color.red;
- }
+ return Color.red;
}
/**
@@ -102,6 +99,7 @@
/**
* The name for display in a combo box
*/
+ @Override
public String toString()
{
try
Modified: trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/AntiGravityRuleTest.java
===================================================================
--- trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/AntiGravityRuleTest.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/AntiGravityRuleTest.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -51,6 +51,7 @@
/**
* @see TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception
{
super.setUp();
@@ -59,6 +60,7 @@
/**
* @see TestCase#tearDown()
*/
+ @Override
protected void tearDown() throws Exception
{
super.tearDown();
Modified: trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/LinkArrayTest.java
===================================================================
--- trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/LinkArrayTest.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/LinkArrayTest.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -46,10 +46,12 @@
super(s);
}
+ @Override
protected void setUp() throws Exception
{
}
+ @Override
protected void tearDown() throws Exception
{
}
Modified: trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/MapTest.java
===================================================================
--- trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/MapTest.java 2006-03-03 21:40:31 UTC (rev 1027)
+++ trunk/biblemapper/src/test/java/org/crosswire/biblemapper/model/MapTest.java 2006-03-05 11:57:25 UTC (rev 1028)
@@ -64,11 +64,13 @@
};
Position[] ar = null;
+ @Override
protected void setUp() throws Exception
{
ar = Map.cat(dar);
}
+ @Override
protected void tearDown() throws Exception
{
}
More information about the jsword-svn
mailing list