Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java (revision 30646) @@ -39,7 +39,5 @@ } - /* (non-Javadoc) - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { if (e.getSource() instanceof AbstractButton) { @@ -60,11 +58,7 @@ task = new AutoSaveEditLayerTimerTask(osmFilename); gpsDataTimer.schedule(task, 5000, AUTO_SAVE_PERIOD_SEC * 1000); - } else { - if(gpsDataTimer != null) { - gpsDataTimer.cancel(); - } + } else if (gpsDataTimer != null) { + gpsDataTimer.cancel(); } - - } } Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java (revision 30646) @@ -53,13 +53,8 @@ } - - /* (non-Javadoc) - * @see java.util.TimerTask#run() - */ @Override public void run() { try { - GpxLayer gpsLayer = LayerUtil.findGpsLayer(gpsLayerName, GpxLayer.class); if(gpsLayer == null) { Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/MetaAction.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/MetaAction.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/MetaAction.java (revision 30646) @@ -33,5 +33,4 @@ */ public MetaAction() { - // TODO Auto-generated constructor stub } @@ -41,5 +40,4 @@ public MetaAction(String name) { super(name); - // TODO Auto-generated constructor stub } @@ -68,9 +66,5 @@ } - /* - * (non-Javadoc) - * - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { // check if action was called by repeating key presses too long pressed): @@ -78,9 +72,7 @@ if ((time - lastActionCall) < MIN_TIME_DIFF) { lastActionCall = time; -// System.out.println("repeating key detected"); return; } lastActionCall = time; - // System.out.println("meta action '" + super.toString() + "' called"); // toggle on/off Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java (revision 30646) @@ -6,4 +6,5 @@ import static org.openstreetmap.josm.tools.I18n.tr; + import java.awt.BorderLayout; import java.awt.Dimension; @@ -116,8 +117,5 @@ } - - public static void main(String[] args) { - // parse xml file and create component from it: @@ -160,7 +158,5 @@ } - /* (non-Javadoc) - * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) - */ + @Override public void propertyChange(PropertyChangeEvent evt) { if("gpsdata".equals(evt.getPropertyName())) { @@ -171,10 +167,7 @@ } - /* (non-Javadoc) - * @see at.dallermassl.josm.plugin.surveyor.GpsDataSource#getGpsData() - */ + @Override public LiveGpsData getGpsData() { return gpsData; } - } Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java (revision 30646) @@ -50,8 +50,4 @@ } - - /* (non-Javadoc) - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ public void actionPerformed(ActionEvent e) { if(surveyorFrame == null) { @@ -59,15 +55,4 @@ SurveyorComponent comp = createComponent(); -// comp.setGridSize(3,3); -// comp.addButton(new ButtonDescription("Tunnel", "T", "images/symbols/tunnel.png", "ConsolePrinterAction", ButtonType.SINGLE)); -// comp.addButton(new ButtonDescription("Bridge", "B", null, "ConsolePrinterAction", ButtonType.TOGGLE)); -// comp.addButton(new ButtonDescription("Motorway", "M", null, "ConsolePrinterAction", null)); -// comp.addButton(new ButtonDescription("Primary", "I", null, "ConsolePrinterAction", null)); -// comp.addButton(new ButtonDescription("Secondary", "S", null, "ConsolePrinterAction", null)); -// comp.addButton(new ButtonDescription("Unclassified", "U", null, "ConsolePrinterAction", null)); -// comp.addButton(new ButtonDescription("Residential", "R", null, -// new SurveyorActionDescription("SetWaypointAction", new String[] {"residential", "images/reorder.png"}), null)); -// comp.addButton(new ButtonDescription("Parking", "P", "images/symbols/parking.png", -// new SurveyorActionDescription("SetNodeAction", new String[] {"amenity", "parking", "createdby", "surveyor"}), null)); // add component as gps event listener: @@ -143,5 +128,4 @@ } return component; - } @@ -175,9 +159,8 @@ actions.add((SurveyorActionDescription)object); } else { - System.err.println("surveyor: unknown xml element: " + object); + Main.error("surveyor: unknown xml element: " + object); } } return surveyorComponent; } - } Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/AbstractSurveyorAction.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/AbstractSurveyorAction.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/AbstractSurveyorAction.java (revision 30646) @@ -24,11 +24,7 @@ } - /* (non-Javadoc) - * @see at.dallermassl.josm.plugin.surveyor.SurveyorAction#setParameters(java.util.List) - */ - //@Override + @Override public void setParameters(List parameters) { this.parameters = parameters; } - } Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/BeepAction.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/BeepAction.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/BeepAction.java (revision 30646) @@ -20,9 +20,7 @@ int beepNumber = 1; - /* (non-Javadoc) - * @see at.dallermassl.josm.plugin.surveyor.SurveyorAction#actionPerformed(at.dallermassl.josm.plugin.surveyor.GpsActionEvent) - */ + @Override public void actionPerformed(GpsActionEvent event) { - // run as a separate thread + // run as a separate thread Main.worker.execute(new Runnable() { public void run() { @@ -38,7 +36,5 @@ } - /* (non-Javadoc) - * @see at.dallermassl.josm.plugin.surveyor.SurveyorAction#setParameters(java.util.List) - */ + @Override public void setParameters(List parameters) { try { @@ -49,4 +45,3 @@ } } - } Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/ConsolePrinterAction.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/ConsolePrinterAction.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/ConsolePrinterAction.java (revision 30646) @@ -15,7 +15,5 @@ public class ConsolePrinterAction extends AbstractSurveyorAction { - /* (non-Javadoc) - * @see at.dallermassl.josm.plugin.surveyor.ButtonAction#actionPerformed(at.dallermassl.josm.plugin.surveyor.GpsActionEvent, java.util.List) - */ + @Override public void actionPerformed(GpsActionEvent event) { LatLon coordinates = event.getCoordinates(); @@ -23,4 +21,3 @@ + coordinates.lon() + " params: " + getParameters()); } - } Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java (revision 30646) @@ -32,8 +32,5 @@ private String audioSource = null; - /* (non-Javadoc) - * @see at.dallermassl.josm.plugin.surveyor.SurveyorAction#actionPerformed(at.dallermassl.josm.plugin.surveyor.GpsActionEvent) - */ - //@Override + @Override public void actionPerformed(GpsActionEvent event) { // run as a separate thread @@ -43,5 +40,4 @@ if(audioSource == null) { audioSource = getParameters().get(0); - //System.out.println("reading audio from " + audioSource); } InputStream in = new BufferedInputStream(ResourceLoader.getInputStream(audioSource)); Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java (revision 30646) @@ -36,8 +36,5 @@ } - /* (non-Javadoc) - * @see at.dallermassl.josm.plugin.surveyor.SurveyorAction#setParameters(java.util.List) - */ - //@Override + @Override public void setParameters(List parameters) { keyValues = new ArrayList>(); @@ -57,7 +54,5 @@ } - /* (non-Javadoc) - * @see at.dallermassl.josm.plugin.surveyor.ButtonAction#actionPerformed(at.dallermassl.josm.plugin.surveyor.GpsActionEvent) - */ + @Override public void actionPerformed(GpsActionEvent event) { LatLon coordinates = event.getCoordinates(); Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java (revision 30646) @@ -24,4 +24,5 @@ import at.dallermassl.josm.plugin.surveyor.SurveyorLock; import at.dallermassl.josm.plugin.surveyor.SurveyorPlugin; +import at.dallermassl.josm.plugin.surveyor.action.gui.DialogClosingThread; import at.dallermassl.josm.plugin.surveyor.action.gui.WaypointDialog; import at.dallermassl.josm.plugin.surveyor.util.LayerUtil; @@ -47,10 +48,5 @@ } - - /* (non-Javadoc) - * @see at.dallermassl.josm.plugin.surveyor.ButtonAction#actionPerformed(at.dallermassl.josm.plugin.surveyor.GpsActionEvent, java.util.List) - */ public void actionPerformed(GpsActionEvent event) { - //System.out.println(getClass().getSimpleName() + " KOORD: " + coordinates.lat() + ", " + coordinates.lon()); String markerTitle = getParameters().get(0); Object source = event.getSource(); @@ -62,17 +58,29 @@ } } + + String iconName = getParameters().size() > 1 ? getParameters().get(1).trim() : null; - if(dialog == null) { - dialog = new WaypointDialog(); + long timeout = DialogClosingThread.DEFAULT_TIMEOUT; + if (getParameters().size() > 2) { + try { + timeout = Integer.parseInt(getParameters().get(2)); + } catch (NumberFormatException e) { + Main.error(e.getMessage()); + } } - + String markerText = markerTitle; - String inputText = dialog.openDialog(SurveyorPlugin.getSurveyorFrame(), tr("Waypoint Description")); - if(inputText != null && inputText.length() > 0) { - inputText = inputText.replaceAll("<", "_"); // otherwise the gpx file is ruined - markerText = markerText + " " + inputText; + + if (timeout > 0) { + if (dialog == null) { + dialog = new WaypointDialog(); + } + + String inputText = dialog.openDialog(SurveyorPlugin.getSurveyorFrame(), tr("Waypoint Description"), timeout*1000); + if(inputText != null && inputText.length() > 0) { + inputText = inputText.replaceAll("<", "_"); // otherwise the gpx file is ruined + markerText = markerText + " " + inputText; + } } - - String iconName = getParameters().size() > 1 ? getParameters().get(1) : null; // add the waypoint to the marker layer AND to the gpx layer @@ -82,8 +90,7 @@ WayPoint waypoint = new WayPoint(event.getCoordinates()); waypoint.attr.put("name", markerText); - if(iconName != null) + if(iconName != null && !iconName.isEmpty()) waypoint.attr.put("sym", iconName); synchronized(SurveyorLock.class) { - //layer.data.add(new Marker(event.getCoordinates(), markerText, iconName)); layer.data.add(new Marker(event.getCoordinates(), markerText, iconName, null, -1.0, 0.0)); if(gpsLayer != null) { @@ -105,5 +112,4 @@ if(markerLayer == null) { // not found, add a new one - //markerLayer = new MarkerLayer(new GpxData(), MARKER_LAYER_NAME, null); markerLayer = new MarkerLayer(new GpxData(), MARKER_LAYER_NAME, null, null); Main.main.addLayer(markerLayer); @@ -129,4 +135,3 @@ return liveGpsLayer; } - } Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SystemExecuteAction.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SystemExecuteAction.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SystemExecuteAction.java (revision 30646) @@ -10,4 +10,6 @@ import java.io.InputStreamReader; +import org.openstreetmap.josm.Main; + import at.dallermassl.josm.plugin.surveyor.GpsActionEvent; @@ -18,19 +20,12 @@ public class SystemExecuteAction extends AbstractSurveyorAction { - /* (non-Javadoc) - * @see at.dallermassl.josm.plugin.surveyor.SurveyorAction#actionPerformed(at.dallermassl.josm.plugin.surveyor.GpsActionEvent, java.util.List) - */ - //@Override + @Override public void actionPerformed(GpsActionEvent event) { final ProcessBuilder builder = new ProcessBuilder(getParameters()); - //Map environ = builder.environment(); builder.directory(new File(System.getProperty("user.home"))); - System.out.println("Directory : " + builder.directory()); + Main.debug("Directory : " + builder.directory()); Thread executionThread = new Thread() { - /* (non-Javadoc) - * @see java.lang.Thread#run() - */ @Override public void run() { @@ -48,16 +43,9 @@ System.out.println(getClass().getSimpleName() + "Program terminated!"); } catch (Throwable t) { - t.printStackTrace(); + Main.error(t); } } - }; executionThread.start(); -// try { -// System.in.read(); -// } catch (IOException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } } } Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/DialogClosingThread.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/DialogClosingThread.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/DialogClosingThread.java (revision 30646) @@ -15,4 +15,6 @@ import javax.swing.event.DocumentListener; +import org.openstreetmap.josm.Main; + /** * @author cdaller @@ -20,5 +22,5 @@ */ public class DialogClosingThread extends Thread implements KeyListener, DocumentListener { - private static long DEFAULT_TIMEOUT = 5000; + public static final long DEFAULT_TIMEOUT = 5000; private JDialog dialog; private long timeout; @@ -44,7 +46,4 @@ } - /* (non-Javadoc) - * @see java.lang.Thread#run() - */ @Override public void run() { @@ -66,29 +65,20 @@ } - /* (non-Javadoc) - * @see java.awt.event.KeyListener#keyPressed(java.awt.event.KeyEvent) - */ - //@Override + @Override public void keyPressed(KeyEvent e) { reset(); - System.out.println("keypressed: " + e.getKeyCode()); + Main.debug("keypressed: " + e.getKeyCode()); } - /* (non-Javadoc) - * @see java.awt.event.KeyListener#keyReleased(java.awt.event.KeyEvent) - */ - //@Override + @Override public void keyReleased(KeyEvent e) { reset(); - System.out.println("keyreleased: " + e.getKeyCode()); + Main.debug("keyreleased: " + e.getKeyCode()); } - /* (non-Javadoc) - * @see java.awt.event.KeyListener#keyTyped(java.awt.event.KeyEvent) - */ - //@Override + @Override public void keyTyped(KeyEvent e) { reset(); - System.out.println("keytyped: " + e.getKeyCode()); + Main.debug("keytyped: " + e.getKeyCode()); } @@ -114,29 +104,20 @@ } - /* (non-Javadoc) - * @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent) - */ - //@Override + @Override public void changedUpdate(DocumentEvent e) { reset(); - System.out.println("changedUpdate: " + e); + Main.debug("changedUpdate: " + e); } - /* (non-Javadoc) - * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) - */ - //@Override + @Override public void insertUpdate(DocumentEvent e) { reset(); - System.out.println("insertUpdate: " + e); + Main.debug("insertUpdate: " + e); } - /* (non-Javadoc) - * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) - */ - //@Override + @Override public void removeUpdate(DocumentEvent e) { reset(); - System.out.println("removeUpdate: " + e); + Main.debug("removeUpdate: " + e); } } Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/WaypointDialog.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/WaypointDialog.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/WaypointDialog.java (revision 30646) @@ -5,5 +5,4 @@ package at.dallermassl.josm.plugin.surveyor.action.gui; -import java.awt.BorderLayout; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -11,8 +10,6 @@ import javax.swing.JDialog; import javax.swing.JFrame; -import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JTextField; - /** @@ -22,5 +19,5 @@ public class WaypointDialog { - public String openDialog(JFrame frame, String message) { + public String openDialog(JFrame frame, String message, long timeout) { JTextField textField = new JTextField(10); @@ -29,6 +26,5 @@ Object[] array = {message, textField}; - //Create an array specifying the number of dialog buttons - //and their text. + //Create an array specifying the number of dialog buttons and their text. Object[] options = {"OK"}; @@ -41,11 +37,6 @@ options[0]); -// final JOptionPane optionPane = new JOptionPane("The only way to close this dialog is by\n" -// + "pressing one of the following buttons.\n" + "Do you understand?", -// JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_NO_OPTION); - - final JDialog dialog = new JDialog(frame, "Enter Description", true); - DialogClosingThread closer = new DialogClosingThread(dialog); + DialogClosingThread closer = new DialogClosingThread(dialog, timeout); closer.observe(textField); dialog.setContentPane(optionPane); @@ -57,6 +48,5 @@ && (prop.equals(JOptionPane.VALUE_PROPERTY))) { // If you were going to check something - // before closing the window, you'd do - // it here. + // before closing the window, you'd do it here. dialog.setVisible(false); } @@ -67,36 +57,5 @@ dialog.setVisible(true); - - //System.out.println("value: " + optionPane.getValue()); return textField.getText(); - -// int value = ((Integer) optionPane.getValue()).intValue(); -// if (value == JOptionPane.YES_OPTION) { -// System.out.println("yes"); -// } else if (value == JOptionPane.NO_OPTION) { -// System.out.println("no"); -// } - } - - public static void main(String[] args) { - //1. Create the frame. - JFrame frame = new JFrame("FrameDemo"); - - //2. Optional: What happens when the frame closes? - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - - //3. Create components and put them in the frame. - //...create emptyLabel... - frame.getContentPane().add(new JLabel("test"), BorderLayout.CENTER); - - //4. Size the frame. - frame.pack(); - frame.setSize(600,400); - frame.setLocation(0,0); - - //5. Show it. - frame.setVisible(true); - new WaypointDialog().openDialog(frame, "test"); - } } Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/util/ResourceLoader.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/util/ResourceLoader.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/util/ResourceLoader.java (revision 30646) @@ -37,5 +37,4 @@ in = new FileInputStream(source); } - System.out.println("stream for resource is " + in); return in; } Index: /applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java =================================================================== --- /applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java (revision 30645) +++ /applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java (revision 30646) @@ -801,142 +801,3 @@ return(new_list); } - -// /** -// * Demonstrates the low level interface. -// * @param args command line arguments. -// */ -// protected static void testLowLevel(String[] args) -// { -// try -// { -// String filename; -// if(args.length > 0) -// filename = args[0]; -// else -// filename = "/filer/cdaller/tmp/test.csv"; -// -// Tokenizer tokenizer = new Tokenizer(new BufferedReader(new FileReader(filename))); -//// Tokenizer tokenizer = new Tokenizer("column1,\"quoted column2\",column3\\, with quoted comma"); -// tokenizer.setDelimiter(','); -//// tokenizer.eolIsSignificant(false); -// tokenizer.respectEscapedCharacters(true); -// tokenizer.respectQuotedWords(true); -// -// int token; -// while((token = tokenizer.nextToken()) != Tokenizer.EOF) -// { -// switch(token) -// { -// case Tokenizer.EOL: -// System.out.println("------------- "); -// break; -// case Tokenizer.WORD: -// System.out.println("line" +tokenizer.getLineNumber() +" word: "+tokenizer.getWord()); -// break; -// case Tokenizer.QUOTED_WORD: -// System.out.println("line" +tokenizer.getLineNumber() +" quoted word: "+tokenizer.getWord()); -// break; -// case Tokenizer.DELIMITER: -// System.out.println("delimiter"); -// break; -// default: -// System.err.println("Unknown Token: "+token); -// } -// } -// tokenizer.close(); -// } -// catch(Exception ioe) -// { -// ioe.printStackTrace(); -// } -// } -// -// -// /** -// * Demonstration of the high level interface. -// * @param args command line arguments. -// */ -// protected static void testHighLevel(String[] args) -// { -// try -// { -// String filename; -// if(args.length > 0) -// filename = args[0]; -// else -// filename = "/filer/cdaller/tmp/test.csv"; -// -// Tokenizer tokenizer = new Tokenizer(new BufferedReader(new FileReader(filename))); -//// Tokenizer tokenizer = new Tokenizer("column1,\"quoted column2\",column3\\, with quoted comma"); -// tokenizer.setDelimiter(','); -//// tokenizer.eolIsSignificant(false); -// tokenizer.respectEscapedCharacters(true); -// tokenizer.respectQuotedWords(true); -// -// List list; -// while(tokenizer.hasNextLine()) -// { -// list = tokenizer.nextLine(); -// System.out.println("List: "+list); -// System.out.println("List w/o zero length elements: "+removeZeroLengthElements(list)); -// System.out.println("--"); -// } -// -// } -// catch(Exception ioe) -// { -// ioe.printStackTrace(); -// } -// } -// -// /** -// * Demo code for the high level interface. -// */ -// protected static void testHighLevelExample() -// { -// try -// { -// // simple example, tokenizing string, no escape, but quoted -// // works: -// System.out.println("example 1"); -// Tokenizer tokenizer = new Tokenizer("text,,,\"another,text\""); -// List tokens; -// while(tokenizer.hasNextLine()) -// { -// tokens = tokenizer.nextLine(); -// System.out.println(tokens.get(0)); // prints 'text' -// System.out.println(tokens.get(1)); // prints '' -// System.out.println(tokens.get(2)); // prints '' -// System.out.println(tokens.get(3)); // prints 'another,text' -// } -// -// System.out.println("example 2"); -// // simple example, tokenizing string, using escape char and -// // quoted strings: -// tokenizer = new Tokenizer("text,text with\\,comma,,\"another,text\""); -// tokenizer.respectEscapedCharacters(true); -// while(tokenizer.hasNextLine()) -// { -// tokens = tokenizer.nextLine(); -// System.out.println(tokens.get(0)); // prints 'text' -// System.out.println(tokens.get(1)); // prints 'text with, comma' -// System.out.println(tokens.get(2)); // prints '' -// System.out.println(tokens.get(3)); // prints 'another,text' -// } -// } -// catch(Exception ioe) -// { -// ioe.printStackTrace(); -// } -// } -// -// public static void main(String[] args) -// { -//// testLowLevel(args); -//// testHighLevel(args); -//// testGeonetUTF8(args); -// testHighLevelExample(); -// } } - -