feature/current_conditions #5

Merged
Vulpovile merged 4 commits from feature/current_conditions into master 2025-04-27 04:31:01 +00:00
34 changed files with 938 additions and 212 deletions
Showing only changes of commit 655aa74f12 - Show all commits

View File

@@ -3,6 +3,6 @@
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/> <classpathentry kind="src" path="resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="jlayer2.jar"/> <classpathentry kind="lib" path="jlayer-1.0.4.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

View File

@@ -1,5 +1,6 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6 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.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 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.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 org.eclipse.jdt.core.compiler.source=1.6

Binary file not shown.

BIN
jlayer-1.0.4.jar Normal file

Binary file not shown.

Binary file not shown.

View File

@@ -47,7 +47,6 @@ public class AudioManager implements AudioFinishedListener {
audioPlaylist.shuffle(); audioPlaylist.shuffle();
} }
@Override
public void audioFinished(String key, URL resource) { public void audioFinished(String key, URL resource) {
playingKeys.remove(key); playingKeys.remove(key);
if (playingKeys.size() == 0) if (playingKeys.size() == 0)
@@ -92,8 +91,6 @@ public class AudioManager implements AudioFinishedListener {
if (currThread != null) if (currThread != null)
return; return;
currThread = new Thread(new Runnable() { currThread = new Thread(new Runnable() {
@Override
public void run() { public void run() {
try try

View File

@@ -1,11 +1,11 @@
package com.flaremicro.visualforecast; package com.flaremicro.visualforecast;
import java.io.File; import java.io.File;
import java.io.FileReader; import java.io.FileInputStream;
import java.io.FileWriter; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.InputStream;
import java.io.Writer; import java.io.OutputStream;
import java.util.Properties; import java.util.Properties;
import com.flaremicro.util.Util; import com.flaremicro.util.Util;
@@ -23,12 +23,12 @@ public class PropertyManager {
public boolean load() { public boolean load() {
synchronized(prop){ synchronized(prop){
Reader reader = null; InputStream reader = null;
try try
{ {
if (propFile.exists()) if (propFile.exists())
{ {
reader = new FileReader(propFile); reader = new FileInputStream(propFile);
prop.load(reader); prop.load(reader);
return true; return true;
} }
@@ -48,10 +48,10 @@ public class PropertyManager {
public boolean store() { public boolean store() {
synchronized(prop){ synchronized(prop){
Writer writer = null; OutputStream writer = null;
try try
{ {
writer = new FileWriter(propFile); writer = new FileOutputStream(propFile);
prop.store(writer, "VisualForecast 1000 Properties file. Functional provider must be set for successful boot!"); prop.store(writer, "VisualForecast 1000 Properties file. Functional provider must be set for successful boot!");
return true; return true;
} }

View File

@@ -256,7 +256,6 @@ public class RenderPanel extends JPanel implements Tickable, ComponentListener {
addRedrawBound(x, y, w, h, true); addRedrawBound(x, y, w, h, true);
} }
@Override
public void componentResized(ComponentEvent e) { public void componentResized(ComponentEvent e) {
loseRedrawRegion(); loseRedrawRegion();
} }
@@ -272,19 +271,16 @@ public class RenderPanel extends JPanel implements Tickable, ComponentListener {
this.currentFlavour.redrawRegionlost(this); this.currentFlavour.redrawRegionlost(this);
} }
@Override
public void componentMoved(ComponentEvent e) { public void componentMoved(ComponentEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void componentShown(ComponentEvent e) { public void componentShown(ComponentEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void componentHidden(ComponentEvent e) { public void componentHidden(ComponentEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub

View File

@@ -97,7 +97,6 @@ public class VisualForecastFrame extends JFrame implements WindowListener, KeyLi
executor = new Executor(this.renderPane, 30); executor = new Executor(this.renderPane, 30);
executor.begin(); executor.begin();
timer = new Timer(33, new ActionListener() { timer = new Timer(33, new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
renderPane.performPaintIfNeeded(); renderPane.performPaintIfNeeded();
} }
@@ -133,55 +132,46 @@ public class VisualForecastFrame extends JFrame implements WindowListener, KeyLi
addKeyListener(this); addKeyListener(this);
} }
@Override
public void windowOpened(WindowEvent e) { public void windowOpened(WindowEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void windowClosing(WindowEvent e) { public void windowClosing(WindowEvent e) {
end(); end();
} }
@Override
public void windowClosed(WindowEvent e) { public void windowClosed(WindowEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void windowIconified(WindowEvent e) { public void windowIconified(WindowEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void windowDeiconified(WindowEvent e) { public void windowDeiconified(WindowEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void windowActivated(WindowEvent e) { public void windowActivated(WindowEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void windowDeactivated(WindowEvent e) { public void windowDeactivated(WindowEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void keyTyped(KeyEvent e) { public void keyTyped(KeyEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_F11) if (e.getKeyCode() == KeyEvent.VK_F11)
{ {
@@ -200,7 +190,6 @@ public class VisualForecastFrame extends JFrame implements WindowListener, KeyLi
} }
} }
@Override
public void keyReleased(KeyEvent e) { public void keyReleased(KeyEvent e) {
// TODO Auto-generated method stub // TODO Auto-generated method stub

View File

@@ -33,7 +33,7 @@ public class HourlyForecastDisplay implements Display {
private int townIndex; private int townIndex;
private int ticksBeforeChange = 200; private int ticksBeforeChange = 200;
private int animationTicks = -1; // private int animationTicks = -1;
private byte[] windchill = null; private byte[] windchill = null;
private byte[] tempval = null; private byte[] tempval = null;