Treer
/
amidstest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed unnecessary ComponentListener

master
flying sheep 2013-04-13 22:39:20 +02:00
parent ab65ccfb83
commit c2124315e3
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/MoF/MapViewer.java
View File

@ -32,7 +32,7 @@ import javax.swing.JComponent;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
public class MapViewer extends JComponent implements MouseListener, MouseWheelListener, ComponentListener {
public class MapViewer extends JComponent implements MouseListener, MouseWheelListener {
/**
*
*/
@ -68,7 +68,6 @@ public class MapViewer extends JComponent implements MouseListener, MouseWheelLi
testMap = new Map(proj.manager, new BiomeLayer()); //TODO: implement more layers
addMouseListener(this);
addComponentListener(this);
addMouseWheelListener(this);
}
@ -176,11 +175,6 @@ public class MapViewer extends JComponent implements MouseListener, MouseWheelLi
} else lastMouse = null;
}
public void componentHidden(ComponentEvent arg0) {}
public void componentMoved(ComponentEvent arg0) {}
public void componentResized(ComponentEvent arg0) {}
public void componentShown(ComponentEvent arg0) {}
public MapObject getSelectedObject() {
return proj.curTarget;
}

12
src/amidst/map/Map.java
View File

@ -90,9 +90,7 @@ public class Map {
tileHeight = 1;
}
}
public void clear() {
}
public void addColumn(boolean start) {
synchronized (resizeLock) {
int x = 0;
@ -121,7 +119,7 @@ public class Map {
}
newFrag.endOfLine = true;
frag.endOfLine = false;
frag.setNext(newFrag);
frag.setNext(newFrag);
frag = newFrag;
}
@ -226,15 +224,17 @@ public class Map {
public void setZoom(double scale) {
this.scale = scale;
}
public double getZoom() {
return scale;
}
public Point2D.Double getScaled(double oldScale, double newScale, Point p) {
double baseX = p.x - start.x;
double scaledX = baseX - (baseX/oldScale) * newScale;
double scaledX = baseX - (baseX / oldScale) * newScale;
double baseY = p.y - start.y;
double scaledY = baseY - (baseY/oldScale) * newScale;
double scaledY = baseY - (baseY / oldScale) * newScale;
return new Point2D.Double(scaledX, scaledY);
}