diff -u Dexter-0.49/AffineTrafo.java Dexter-EDP/AffineTrafo.java --- Dexter-0.49/AffineTrafo.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/AffineTrafo.java 2008-03-03 10:32:37.000000000 +0100 @@ -22,7 +22,6 @@ // tabsize=2 import java.awt.Point; -import java.lang.Math.*; class TwoDMatrix diff -u Dexter-0.49/AppletDataDeliverer.java Dexter-EDP/AppletDataDeliverer.java --- Dexter-0.49/AppletDataDeliverer.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/AppletDataDeliverer.java 2008-03-03 10:27:38.000000000 +0100 @@ -84,9 +84,8 @@ try { BufferedReader in = new BufferedReader( new InputStreamReader(savec.getInputStream())); - String inputLine; - while ((inputLine = in.readLine()) != null) { + while (in.readLine() != null) { } in.close(); } catch (java.io.IOException e) { diff -u Dexter-0.49/AutoAxisFinder.java Dexter-EDP/AutoAxisFinder.java --- Dexter-0.49/AutoAxisFinder.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/AutoAxisFinder.java 2008-03-03 10:42:25.000000000 +0100 @@ -18,7 +18,6 @@ // tabsize=2 import java.awt.*; -import java.awt.event.*; import java.util.*; class AutoAxisFinder extends Recogniser @@ -49,7 +48,7 @@ // takes a Vector of (coo1,coo2,weight) triples and selects two // with the largest weights and greatest distance in coo1 // !! this may destroy points !! - protected int[] chooseLimits(Vector points) throws Exception + protected int[] chooseLimits(Vector points) throws Exception { int ct = 0; int i, leftpos = 0,rightpos = 0; @@ -118,7 +117,6 @@ // walk along the lower axis, starting left and memorising the tick marks Point cp=new Point(ind%px_w,ind/px_w); - Rectangle r; int lastweight = findCB(cp.x+cp.y*px_w).x; int axisWeight = lastweight; int xlimit=axisRight-(axisRight-axisLeft)/30; @@ -187,7 +185,6 @@ // walk up along the left axis and memorising the tick marks Point cp=new Point(ind%px_w,ind/px_w); - Rectangle r; int res[] = findxCB(cp.x+cp.y*px_w); int thisweight = res[0]; int targx = res[3]; diff -u Dexter-0.49/Datapoint.java Dexter-EDP/Datapoint.java --- Dexter-0.49/Datapoint.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/Datapoint.java 2008-03-03 10:40:38.000000000 +0100 @@ -21,9 +21,7 @@ import java.awt.*; import java.awt.event.*; -import java.awt.geom.*; //import java.util.Comparator; ( when MS finally puts j2 into their VMs) -import java.lang.*; public class Datapoint implements Comparator { @@ -62,7 +60,7 @@ return; } if (e.isShiftDown() || - ((e.getModifiers()&e.BUTTON2_MASK)==e.BUTTON2_MASK)) { + ((e.getModifiers()&InputEvent.BUTTON2_MASK)==InputEvent.BUTTON2_MASK)) { this.parent.removePoint(this.me); e.consume(); } Les fichiers binaires Dexter-0.49/Debuxter.jar et Dexter-EDP/Debuxter.jar sont différents. diff -u Dexter-0.49/Debuxter.java Dexter-EDP/Debuxter.java --- Dexter-0.49/Debuxter.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/Debuxter.java 2008-03-03 10:42:37.000000000 +0100 @@ -18,9 +18,7 @@ // tabsize=2 import java.awt.*; -import java.awt.event.*; import java.awt.image.*; -import java.io.*; class Debuxter_w extends Frame implements MainServices { @@ -36,7 +34,6 @@ public Debuxter_w(String args[]) { Rectangle bbox=new Rectangle(); - Image fullpg; ColorModel colormodel = Toolkit.getDefaultToolkit().getColorModel(); if (colormodel instanceof IndexColorModel) { @@ -80,8 +77,8 @@ public class Debuxter { public static void main(String[] args) - { Debuxter_w d; + { - d = new Debuxter_w(args); + new Debuxter_w(args); } } Seulement dans Dexter-EDP/: Dexter.jar diff -u Dexter-0.49/Dexter.java Dexter-EDP/Dexter.java --- Dexter-0.49/Dexter.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/Dexter.java 2008-03-03 10:26:15.000000000 +0100 @@ -19,9 +19,7 @@ import java.applet.*; import java.awt.*; -import java.awt.event.*; import java.awt.image.*; -import java.io.*; import java.net.URL; import java.net.MalformedURLException; import java.awt.Color; diff -u Dexter-0.49/DExtractor.java Dexter-EDP/DExtractor.java --- Dexter-0.49/DExtractor.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/DExtractor.java 2008-03-03 10:44:35.000000000 +0100 @@ -20,9 +20,7 @@ import java.awt.*; import java.awt.event.*; -import java.awt.geom.*; import java.util.*; -import java.lang.*; // The text fields (and the log box) to specify beginning and and @@ -224,7 +222,7 @@ Rectangle bbox; String datasetName; String targetFName; - int scale=3; + int scale=1; static final long serialVersionUID = 20060308L; AffineTrafo transformation = null; @@ -663,7 +661,6 @@ private void makedata_orth() { Datapoint points[]; - java.util.List pointList; boolean needVertBars=false, needHorizBars=false; // Update transform and bail out if we don't have enough diff -u Dexter-0.49/Gauge.java Dexter-EDP/Gauge.java --- Dexter-0.49/Gauge.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/Gauge.java 2008-03-03 10:32:47.000000000 +0100 @@ -19,7 +19,6 @@ import java.awt.*; import java.awt.event.*; -import java.awt.geom.*; class Gauge diff -u Dexter-0.49/ImageWithPoints.java Dexter-EDP/ImageWithPoints.java --- Dexter-0.49/ImageWithPoints.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/ImageWithPoints.java 2008-03-03 10:39:31.000000000 +0100 @@ -18,11 +18,8 @@ // // tabsize=2 -import java.applet.*; import java.awt.*; import java.awt.event.*; -import java.awt.geom.*; -import java.io.*; import java.util.Vector; import java.util.Enumeration; import java.util.Iterator; @@ -135,8 +132,6 @@ void paintPoints(Graphics g) { - Point pt; - for (Iterator it=this.points.iterator(); it.hasNext();) { it.next().paint(g); } @@ -462,8 +457,6 @@ public void print() { - int i; - for (Iterator it=this.points.iterator(); it.hasNext();) { System.out.println(it.next().center); } @@ -476,14 +469,14 @@ { int x = e.getX(); int y = e.getY(); - Enumeration pts = points.elements(); + Enumeration pts = points.elements(); while (pts.hasMoreElements() && !e.isConsumed()) ((Datapoint)pts.nextElement()).mouseClicked(e); if (e.isConsumed()) return; if (!e.isShiftDown()&& - ((e.getModifiers()&e.BUTTON1_MASK)==e.BUTTON1_MASK)) + ((e.getModifiers()&InputEvent.BUTTON1_MASK)==InputEvent.BUTTON1_MASK)) { addPoint(new Point(x,y)); e.consume(); } @@ -491,7 +484,7 @@ public void mousePressed(MouseEvent e) { - Enumeration pts = points.elements(); + Enumeration pts = points.elements(); if (hgauge!=null) hgauge.mousePressed(e); @@ -507,7 +500,7 @@ public void mouseReleased(MouseEvent e) { - Enumeration pts = points.elements(); + Enumeration pts = points.elements(); if (hgauge!=null) hgauge.mouseReleased(e); @@ -538,7 +531,7 @@ { public void mouseDragged(MouseEvent e) { - Enumeration pts = points.elements(); + Enumeration pts = points.elements(); newMousePos(e.getPoint()); if (hgauge!=null) diff -u Dexter-0.49/LineTracer.java Dexter-EDP/LineTracer.java --- Dexter-0.49/LineTracer.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/LineTracer.java 2008-03-03 10:35:26.000000000 +0100 @@ -18,9 +18,7 @@ // // tabsize=2 -import java.lang.*; import java.awt.*; -import java.awt.image.*; class LineTracer extends Recogniser @@ -44,7 +42,6 @@ { Point curpoint=new Point(startPoint); Point lastmax=null, lastmin=null; - boolean minPlotted=false, maxPlotted=false; int targy=curpoint.y; int lastXDrawn; int lastdY=0, dY, lastY=curpoint.y; diff -u Dexter-0.49/PointFinder.java Dexter-EDP/PointFinder.java --- Dexter-0.49/PointFinder.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/PointFinder.java 2008-03-03 10:41:58.000000000 +0100 @@ -18,10 +18,8 @@ // // tabsize=2 -import java.lang.*; import java.awt.*; import java.util.*; -import java.awt.image.*; class Feature { byte[] tPixels; @@ -435,7 +433,7 @@ if (ind%px_w>bbox.x+bbox.width) bbox.width = ind%px_w-bbox.x; - Enumeration cts=upInds.elements(); + Enumeration cts=upInds.elements(); while (cts.hasMoreElements()) floodFill(((Integer)cts.nextElement()).intValue(),bbox); cts=downInds.elements(); diff -u Dexter-0.49/Recogniser.java Dexter-EDP/Recogniser.java --- Dexter-0.49/Recogniser.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/Recogniser.java 2008-03-03 10:40:01.000000000 +0100 @@ -38,7 +38,7 @@ { } - public void setProperties(Hashtable props) {} + public void setProperties(Hashtable props) {} public void setHints(int hintflags) {} public void setColorModel(ColorModel model) {} @@ -232,7 +232,7 @@ // the line is going by checking the adjacent pixels. protected boolean nextY(Point curpoint,int targy,int dx) { int y=curpoint.y; - int i,ind,ny; + int ind; Rectangle res; int maxweight=0,maxpos=0,maxblack=0; int seenThrough=px_h; @@ -309,7 +309,7 @@ // as nextY, only in x direction protected boolean nextX(Point curpoint,int targx,int dy) { int x=curpoint.x; - int i,ind,nx; + int ind; int res[]; int maxweight=0,maxpos=0,maxblack=0; int seenThrough=0; diff -u Dexter-0.49/ScrollImScrollBar.java Dexter-EDP/ScrollImScrollBar.java --- Dexter-0.49/ScrollImScrollBar.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/ScrollImScrollBar.java 2008-03-03 10:28:13.000000000 +0100 @@ -20,8 +20,6 @@ import java.awt.*; import java.awt.event.*; -import java.awt.image.*; -import java.io.*; // This class provides an auto-scrolling image on which a rubber band @@ -43,7 +41,6 @@ public ScrollImWithRubber(ScrollImScrollBar parent, Image embeddedImage, boolean onIndexedDisplay) { - int blackindex; this.parent = parent; this.embeddedImage = embeddedImage; diff -u Dexter-0.49/Slider.java Dexter-EDP/Slider.java --- Dexter-0.49/Slider.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/Slider.java 2008-03-03 10:32:15.000000000 +0100 @@ -13,12 +13,10 @@ import java.awt.*; import java.awt.event.*; -import java.util.Vector; import java.lang.Math; import java.awt.AWTEvent; -import java.util.EventListener; class SliderEvent extends AWTEvent { @@ -562,8 +560,6 @@ */ public void handleMouseEvent(int x) { - int w = getSize().width; - thumbPos = Math.max(x, minThumbPos); thumbPos = Math.min(thumbPos, maxThumbPos); diff -u Dexter-0.49/SliderListener.java Dexter-EDP/SliderListener.java --- Dexter-0.49/SliderListener.java 2007-01-01 08:30:39.000000000 +0100 +++ Dexter-EDP/SliderListener.java 2008-03-03 10:32:28.000000000 +0100 @@ -11,7 +11,6 @@ // tabsize 8 -import java.awt.event.*; import java.util.EventListener; public interface SliderListener extends EventListener {