favary/BE_graphes
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move resources to class.

Browse source
This commit is contained in:
Mikael Capelle 2018-03-12 17:32:44 +01:00
parent 17da90c32c
commit 3e93445e38
4 changed files with 90 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
.classpath
View file

@ -1,68 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/classes" path="src/main"> <classpathentry kind="src" output="target/classes" path="src/main">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test"> <classpathentry kind="src" output="target/test-classes" path="src/test">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="libs/kxml2-2.3.0.jar"/> <classpathentry kind="lib" path="libs/kxml2-2.3.0.jar"/>
<classpathentry kind="lib" path="libs/mapsforge-core-0.9.1.jar"> <classpathentry kind="lib" path="libs/mapsforge-core-0.9.1.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-core-0.9.1-javadoc.jar!/"/> <attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-core-0.9.1-javadoc.jar!/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="libs/mapsforge-map-0.9.1.jar"> <classpathentry kind="lib" path="libs/mapsforge-map-0.9.1.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-map-0.9.1-javadoc.jar!/"/> <attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-map-0.9.1-javadoc.jar!/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="libs/mapsforge-map-awt-0.9.1.jar"> <classpathentry kind="lib" path="libs/mapsforge-map-awt-0.9.1.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-map-awt-0.9.1-javadoc.jar!/"/> <attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-map-awt-0.9.1-javadoc.jar!/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="libs/mapsforge-map-reader-0.9.1.jar"> <classpathentry kind="lib" path="libs/mapsforge-map-reader-0.9.1.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-map-reader-0.9.1-javadoc.jar!/"/> <attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-map-reader-0.9.1-javadoc.jar!/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="libs/mapsforge-poi-0.9.1.jar"> <classpathentry kind="lib" path="libs/mapsforge-poi-0.9.1.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-poi-0.9.1-javadoc.jar!/"/> <attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-poi-0.9.1-javadoc.jar!/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="libs/mapsforge-poi-awt-0.9.1.jar"> <classpathentry kind="lib" path="libs/mapsforge-poi-awt-0.9.1.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-poi-awt-0.9.1-javadoc.jar!/"/> <attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-poi-awt-0.9.1-javadoc.jar!/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="libs/mapsforge-themes-0.9.1.jar"> <classpathentry kind="lib" path="libs/mapsforge-themes-0.9.1.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-themes-0.9.1-javadoc.jar!/"/> <attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/mapsforge-themes-0.9.1-javadoc.jar!/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="libs/svg-salamander-1.0.jar"> <classpathentry kind="lib" path="libs/svg-salamander-1.0.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/svg-salamander-1.0-javadoc.jar!/"/> <attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-reloaded/libs/svg-salamander-1.0-javadoc.jar!/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="lib" path="res"/>
</classpath> <classpathentry kind="output" path="target/classes"/>
</classpath>

23
src/main/org/insa/graphics/PathsPanel.java
View file

@ -15,6 +15,7 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import javax.imageio.ImageIO;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.Box; import javax.swing.Box;
import javax.swing.BoxLayout; import javax.swing.BoxLayout;
@ -105,8 +106,10 @@ public class PathsPanel extends JPanel implements DrawingChangeListener, GraphCh
* *
* @param path Path for this bundle, must not be null. * @param path Path for this bundle, must not be null.
* *
* @throws IOException If a resource was not found.
*
*/ */
public PathPanel(Path path) { public PathPanel(Path path) throws IOException {
super(); super();
setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS)); setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS));
setBorder(BorderFactory.createCompoundBorder( setBorder(BorderFactory.createCompoundBorder(
@ -241,8 +244,8 @@ public class PathsPanel extends JPanel implements DrawingChangeListener, GraphCh
} }
}); });
Image newimg = new ImageIcon("res/cross_mark.png").getImage().getScaledInstance(14, 14, Image newimg = ImageIO.read(getClass().getResourceAsStream("/cross_mark.png"))
java.awt.Image.SCALE_SMOOTH); .getScaledInstance(14, 14, java.awt.Image.SCALE_SMOOTH);
JButton deleteButton = new JButton(new ImageIcon(newimg)); JButton deleteButton = new JButton(new ImageIcon(newimg));
deleteButton.setFocusPainted(false); deleteButton.setFocusPainted(false);
deleteButton.setFocusable(false); deleteButton.setFocusable(false);
@ -283,7 +286,6 @@ public class PathsPanel extends JPanel implements DrawingChangeListener, GraphCh
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see java.lang.Object#toString() * @see java.lang.Object#toString()
*/ */
public String toString() { public String toString() {
@ -307,10 +309,15 @@ public class PathsPanel extends JPanel implements DrawingChangeListener, GraphCh
} }
public void addPath(Path path) { public void addPath(Path path) {
this.add(new PathPanel(path)); try {
this.setVisible(true); this.add(new PathPanel(path));
this.revalidate(); this.setVisible(true);
this.repaint(); this.revalidate();
this.repaint();
}
catch (Exception e) {
e.printStackTrace();
}
} }
protected void removePath(PathPanel panel) { protected void removePath(PathPanel panel) {

9
src/main/org/insa/graphics/drawing/components/MapZoomControls.java
View file

@ -13,7 +13,6 @@ import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.image.ImageObserver; import java.awt.image.ImageObserver;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -65,10 +64,10 @@ public class MapZoomControls {
public MapZoomControls(Component component, final int defaultZoom, final int minZoom, public MapZoomControls(Component component, final int defaultZoom, final int minZoom,
final int maxZoom) throws IOException { final int maxZoom) throws IOException {
zoomIn = ImageIO.read(new File("res/zoomIn.png")).getScaledInstance(DEFAULT_HEIGHT, zoomIn = ImageIO.read(getClass().getResourceAsStream("/zoomIn.png"))
DEFAULT_HEIGHT, Image.SCALE_SMOOTH); .getScaledInstance(DEFAULT_HEIGHT, DEFAULT_HEIGHT, Image.SCALE_SMOOTH);
zoomOut = ImageIO.read(new File("res/zoomOut.png")).getScaledInstance(DEFAULT_HEIGHT, zoomOut = ImageIO.read(getClass().getResourceAsStream("/zoomOut.png"))
DEFAULT_HEIGHT, Image.SCALE_SMOOTH); .getScaledInstance(DEFAULT_HEIGHT, DEFAULT_HEIGHT, Image.SCALE_SMOOTH);
this.currentLevel = defaultZoom; this.currentLevel = defaultZoom;
this.minLevel = minZoom; this.minLevel = minZoom;

6
src/main/org/insa/graphics/drawing/overlays/MarkerUtils.java
View file

@ -4,12 +4,9 @@ import java.awt.Color;
import java.awt.Image; import java.awt.Image;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.FileInputStream;
public class MarkerUtils { public class MarkerUtils {
private static final String MARKER_MASK_FILE = "res/marker_mask.bin";
/** /**
* Create an Image representing a marker of the given color. * Create an Image representing a marker of the given color.
* *
@ -44,7 +41,8 @@ public class MarkerUtils {
private static int[][] readMarkerMask() { private static int[][] readMarkerMask() {
if (MASK_CACHE == null) { if (MASK_CACHE == null) {
try { try {
DataInputStream dis = new DataInputStream(new FileInputStream(MARKER_MASK_FILE)); DataInputStream dis = new DataInputStream(
MarkerUtils.class.getResourceAsStream("/marker_mask.bin"));
int nrows = dis.readInt(); int nrows = dis.readInt();
int ncols = dis.readInt(); int ncols = dis.readInt();