diff --git a/.classpath b/.classpath index 6a512aa..4876fe6 100644 --- a/.classpath +++ b/.classpath @@ -3,6 +3,6 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 8000cd6..8ed9687 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.6 @@ -7,5 +8,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/CanadaDatamartProvider.jar b/CanadaDatamartProvider.jar index adb17af..77d51a9 100644 Binary files a/CanadaDatamartProvider.jar and b/CanadaDatamartProvider.jar differ diff --git a/jlayer-1.0.4.jar b/jlayer-1.0.4.jar new file mode 100644 index 0000000..5848ea3 Binary files /dev/null and b/jlayer-1.0.4.jar differ diff --git a/jlayer2.jar b/jlayer2.jar deleted file mode 100644 index d1b027d..0000000 Binary files a/jlayer2.jar and /dev/null differ diff --git a/src/com/flaremicro/visualforecast/AudioManager.java b/src/com/flaremicro/visualforecast/AudioManager.java index b1da640..a2666c6 100644 --- a/src/com/flaremicro/visualforecast/AudioManager.java +++ b/src/com/flaremicro/visualforecast/AudioManager.java @@ -47,7 +47,6 @@ public class AudioManager implements AudioFinishedListener { audioPlaylist.shuffle(); } - @Override public void audioFinished(String key, URL resource) { playingKeys.remove(key); if (playingKeys.size() == 0) @@ -92,8 +91,6 @@ public class AudioManager implements AudioFinishedListener { if (currThread != null) return; currThread = new Thread(new Runnable() { - - @Override public void run() { try diff --git a/src/com/flaremicro/visualforecast/PropertyManager.java b/src/com/flaremicro/visualforecast/PropertyManager.java index c936117..acf9d87 100644 --- a/src/com/flaremicro/visualforecast/PropertyManager.java +++ b/src/com/flaremicro/visualforecast/PropertyManager.java @@ -1,11 +1,11 @@ package com.flaremicro.visualforecast; import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; -import java.io.Reader; -import java.io.Writer; +import java.io.InputStream; +import java.io.OutputStream; import java.util.Properties; import com.flaremicro.util.Util; @@ -23,12 +23,12 @@ public class PropertyManager { public boolean load() { synchronized(prop){ - Reader reader = null; + InputStream reader = null; try { if (propFile.exists()) { - reader = new FileReader(propFile); + reader = new FileInputStream(propFile); prop.load(reader); return true; } @@ -48,10 +48,10 @@ public class PropertyManager { public boolean store() { synchronized(prop){ - Writer writer = null; + OutputStream writer = null; try { - writer = new FileWriter(propFile); + writer = new FileOutputStream(propFile); prop.store(writer, "VisualForecast 1000 Properties file. Functional provider must be set for successful boot!"); return true; } diff --git a/src/com/flaremicro/visualforecast/RenderPanel.java b/src/com/flaremicro/visualforecast/RenderPanel.java index d0de7a3..c5d0254 100644 --- a/src/com/flaremicro/visualforecast/RenderPanel.java +++ b/src/com/flaremicro/visualforecast/RenderPanel.java @@ -256,7 +256,6 @@ public class RenderPanel extends JPanel implements Tickable, ComponentListener { addRedrawBound(x, y, w, h, true); } - @Override public void componentResized(ComponentEvent e) { loseRedrawRegion(); } @@ -272,19 +271,16 @@ public class RenderPanel extends JPanel implements Tickable, ComponentListener { this.currentFlavour.redrawRegionlost(this); } - @Override public void componentMoved(ComponentEvent e) { // TODO Auto-generated method stub } - @Override public void componentShown(ComponentEvent e) { // TODO Auto-generated method stub } - @Override public void componentHidden(ComponentEvent e) { // TODO Auto-generated method stub diff --git a/src/com/flaremicro/visualforecast/VisualForecastFrame.java b/src/com/flaremicro/visualforecast/VisualForecastFrame.java index a5ecf0f..a2999c9 100644 --- a/src/com/flaremicro/visualforecast/VisualForecastFrame.java +++ b/src/com/flaremicro/visualforecast/VisualForecastFrame.java @@ -97,7 +97,6 @@ public class VisualForecastFrame extends JFrame implements WindowListener, KeyLi executor = new Executor(this.renderPane, 30); executor.begin(); timer = new Timer(33, new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { renderPane.performPaintIfNeeded(); } @@ -133,55 +132,46 @@ public class VisualForecastFrame extends JFrame implements WindowListener, KeyLi addKeyListener(this); } - @Override public void windowOpened(WindowEvent e) { // TODO Auto-generated method stub } - @Override public void windowClosing(WindowEvent e) { end(); } - @Override public void windowClosed(WindowEvent e) { // TODO Auto-generated method stub } - @Override public void windowIconified(WindowEvent e) { // TODO Auto-generated method stub } - @Override public void windowDeiconified(WindowEvent e) { // TODO Auto-generated method stub } - @Override public void windowActivated(WindowEvent e) { // TODO Auto-generated method stub } - @Override public void windowDeactivated(WindowEvent e) { // TODO Auto-generated method stub } - @Override public void keyTyped(KeyEvent e) { // TODO Auto-generated method stub } - @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_F11) { @@ -200,7 +190,6 @@ public class VisualForecastFrame extends JFrame implements WindowListener, KeyLi } } - @Override public void keyReleased(KeyEvent e) { // TODO Auto-generated method stub diff --git a/src/com/flaremicro/visualforecast/displays/impl/HourlyForecastDisplay.java b/src/com/flaremicro/visualforecast/displays/impl/HourlyForecastDisplay.java index 872291c..4f8c5fa 100644 --- a/src/com/flaremicro/visualforecast/displays/impl/HourlyForecastDisplay.java +++ b/src/com/flaremicro/visualforecast/displays/impl/HourlyForecastDisplay.java @@ -33,7 +33,7 @@ public class HourlyForecastDisplay implements Display { private int townIndex; private int ticksBeforeChange = 200; - private int animationTicks = -1; +// private int animationTicks = -1; private byte[] windchill = null; private byte[] tempval = null;