();
- for (int i = 0; i < num; ++i)
+ for (int i = 0; i < num; ++i) {
l.add((String)iconsList.getModel().getElementAt(i));
- if(Main.pref.putCollection(iconpref, l))
+ }
+ if(Main.pref.putCollection(iconpref, l)) {
changed = true;
- }
- else if(Main.pref.putCollection(iconpref, null))
+ }
+ }
+ else if(Main.pref.putCollection(iconpref, null)) {
changed = true;
+ }
}
return changed;
@@ -313,22 +374,23 @@
String key = m.group(1);
String value = m.group(2);
- if("author".equals(key) && last.author == null)
+ if("author".equals(key) && last.author == null) {
last.author = value;
- else if("version".equals(key))
+ } else if("version".equals(key)) {
last.version = value;
- else if("link".equals(key) && last.link == null)
+ } else if("link".equals(key) && last.link == null) {
last.link = value;
- else if("description".equals(key) && last.description == null)
+ } else if("description".equals(key) && last.description == null) {
last.description = value;
- else if("shortdescription".equals(key) && last.shortdescription == null)
+ } else if("shortdescription".equals(key) && last.shortdescription == null) {
last.shortdescription = value;
- else if((lang+"author").equals(key))
+ } else if((lang+"author").equals(key)) {
last.author = value;
- else if((lang+"link").equals(key))
+ } else if((lang+"link").equals(key)) {
last.link = value;
- else if((lang+"description").equals(key))
+ } else if((lang+"description").equals(key)) {
last.description = value;
- else if((lang+"shortdescription").equals(key))
+ } else if((lang+"shortdescription").equals(key)) {
last.shortdescription = value;
+ }
}
}
Index: /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (revision 1864)
+++ /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (revision 1865)
@@ -16,5 +16,7 @@
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
import org.openstreetmap.josm.gui.PleaseWaitDialog;
+import static org.openstreetmap.josm.tools.I18n.tr;
@@ -73,4 +75,5 @@
}
+ @Override
public void doBeginTask() {
doInEDT(new Runnable() {
@@ -80,7 +83,6 @@
} else if (dialogParent instanceof Dialog) {
dialog = new PleaseWaitDialog((Dialog)dialogParent);
- } else {
+ } else
throw new ProgressException("PleaseWaitDialog parent must be either Frame or Dialog");
- }
dialog.cancel.setEnabled(true);
@@ -94,4 +96,5 @@
}
+ @Override
public void doFinishTask() {
doInEDT(new Runnable() {
@@ -103,5 +106,8 @@
dialog.cancel.removeActionListener(cancelListener);
if (getErrorMessage() != null) {
- JOptionPane.showMessageDialog(Main.parent, getErrorMessage());
+ OptionPaneUtil.showMessageDialog(
+ Main.parent, getErrorMessage(),
+ tr("Error"),
+ JOptionPane.ERROR_MESSAGE);
}
dialog = null;
@@ -111,4 +117,5 @@
}
+ @Override
protected void updateProgress(double progressValue) {
final int newValue = (int)(progressValue * PROGRESS_BAR_MAX);
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 1864)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 1865)
@@ -44,4 +44,5 @@
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
import org.openstreetmap.josm.gui.QuadStateCheckBox;
import org.openstreetmap.josm.io.MirroredInputStream;
@@ -598,8 +599,18 @@
} catch (IOException e) {
e.printStackTrace();
- JOptionPane.showMessageDialog(Main.parent, tr("Could not read tagging preset source: {0}",source));
+ OptionPaneUtil.showMessageDialog(
+ Main.parent,
+ tr("Could not read tagging preset source: {0}",source),
+ tr("Error"),
+ JOptionPane.ERROR_MESSAGE
+ );
} catch (SAXException e) {
e.printStackTrace();
- JOptionPane.showMessageDialog(Main.parent, tr("Error parsing {0}: ", source)+e.getMessage());
+ OptionPaneUtil.showMessageDialog(
+ Main.parent,
+ tr("Error parsing {0}: ", source)+e.getMessage(),
+ tr("Error"),
+ JOptionPane.ERROR_MESSAGE
+ );
}
}
Index: /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 1864)
+++ /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 1865)
@@ -15,4 +15,5 @@
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
/**
@@ -68,5 +69,6 @@
interrupt();
while (result == Result.WAITING) { sleep(10); /* yield(); */ }
- if (result == Result.FAILED) { throw exception; }
+ if (result == Result.FAILED)
+ throw exception;
}
private void possiblyInterrupt() throws InterruptedException {
@@ -229,33 +231,33 @@
try {
switch (state) {
- case INITIALIZING:
- // we're ready to take interrupts
- state = State.NOTPLAYING;
- break;
- case NOTPLAYING:
- case PAUSED:
- sleep(200);
- break;
- case PLAYING:
- command.possiblyInterrupt();
- for(;;) {
- int nBytesRead = 0;
- nBytesRead = audioInputStream.read(abData, 0, abData.length);
- position += nBytesRead / bytesPerSecond;
+ case INITIALIZING:
+ // we're ready to take interrupts
+ state = State.NOTPLAYING;
+ break;
+ case NOTPLAYING:
+ case PAUSED:
+ sleep(200);
+ break;
+ case PLAYING:
command.possiblyInterrupt();
- if (nBytesRead < 0) { break; }
- audioOutputLine.write(abData, 0, nBytesRead); // => int nBytesWritten
+ for(;;) {
+ int nBytesRead = 0;
+ nBytesRead = audioInputStream.read(abData, 0, abData.length);
+ position += nBytesRead / bytesPerSecond;
+ command.possiblyInterrupt();
+ if (nBytesRead < 0) { break; }
+ audioOutputLine.write(abData, 0, nBytesRead); // => int nBytesWritten
+ command.possiblyInterrupt();
+ }
+ // end of audio, clean up
+ audioOutputLine.drain();
+ audioOutputLine.close();
+ audioOutputLine = null;
+ audioInputStream.close();
+ audioInputStream = null;
+ playingUrl = null;
+ state = State.NOTPLAYING;
command.possiblyInterrupt();
- }
- // end of audio, clean up
- audioOutputLine.drain();
- audioOutputLine.close();
- audioOutputLine = null;
- audioInputStream.close();
- audioInputStream = null;
- playingUrl = null;
- state = State.NOTPLAYING;
- command.possiblyInterrupt();
- break;
+ break;
}
} catch (InterruptedException e) {
@@ -265,46 +267,49 @@
try {
switch (command.command()) {
- case PLAY:
- double offset = command.offset();
- speed = command.speed();
- if (playingUrl != command.url() ||
- stateChange != State.PAUSED ||
- offset != 0.0)
- {
- if (audioInputStream != null) {
- audioInputStream.close();
- audioInputStream = null;
- }
- playingUrl = command.url();
- audioInputStream = AudioSystem.getAudioInputStream(playingUrl);
- audioFormat = audioInputStream.getFormat();
- long nBytesRead = 0;
- position = 0.0;
- offset -= leadIn;
- double calibratedOffset = offset * calibration;
- bytesPerSecond = audioFormat.getFrameRate() /* frames per second */
+ case PLAY:
+ double offset = command.offset();
+ speed = command.speed();
+ if (playingUrl != command.url() ||
+ stateChange != State.PAUSED ||
+ offset != 0.0)
+ {
+ if (audioInputStream != null) {
+ audioInputStream.close();
+ audioInputStream = null;
+ }
+ playingUrl = command.url();
+ audioInputStream = AudioSystem.getAudioInputStream(playingUrl);
+ audioFormat = audioInputStream.getFormat();
+ long nBytesRead = 0;
+ position = 0.0;
+ offset -= leadIn;
+ double calibratedOffset = offset * calibration;
+ bytesPerSecond = audioFormat.getFrameRate() /* frames per second */
* audioFormat.getFrameSize() /* bytes per frame */;
- if (speed * bytesPerSecond > 256000.0)
- speed = 256000 / bytesPerSecond;
- if (calibratedOffset > 0.0) {
- long bytesToSkip = (long)(
- calibratedOffset /* seconds (double) */ * bytesPerSecond);
- /* skip doesn't seem to want to skip big chunks, so
- * reduce it to smaller ones
- */
- // audioInputStream.skip(bytesToSkip);
- while (bytesToSkip > chunk) {
- nBytesRead = audioInputStream.skip(chunk);
- if (nBytesRead <= 0)
- throw new IOException(tr("This is after the end of the recording"));
- bytesToSkip -= nBytesRead;
+ if (speed * bytesPerSecond > 256000.0) {
+ speed = 256000 / bytesPerSecond;
}
- if (bytesToSkip > 0)
- audioInputStream.skip(bytesToSkip);
- position = offset;
- }
- if (audioOutputLine != null)
- audioOutputLine.close();
- audioFormat = new AudioFormat(audioFormat.getEncoding(),
+ if (calibratedOffset > 0.0) {
+ long bytesToSkip = (long)(
+ calibratedOffset /* seconds (double) */ * bytesPerSecond);
+ /* skip doesn't seem to want to skip big chunks, so
+ * reduce it to smaller ones
+ */
+ // audioInputStream.skip(bytesToSkip);
+ while (bytesToSkip > chunk) {
+ nBytesRead = audioInputStream.skip(chunk);
+ if (nBytesRead <= 0)
+ throw new IOException(tr("This is after the end of the recording"));
+ bytesToSkip -= nBytesRead;
+ }
+ if (bytesToSkip > 0) {
+ audioInputStream.skip(bytesToSkip);
+ }
+ position = offset;
+ }
+ if (audioOutputLine != null) {
+ audioOutputLine.close();
+ }
+ audioFormat = new AudioFormat(audioFormat.getEncoding(),
audioFormat.getSampleRate() * (float) (speed * calibration),
audioFormat.getSampleSizeInBits(),
@@ -313,14 +318,14 @@
audioFormat.getFrameRate() * (float) (speed * calibration),
audioFormat.isBigEndian());
- DataLine.Info info = new DataLine.Info(SourceDataLine.class, audioFormat);
- audioOutputLine = (SourceDataLine) AudioSystem.getLine(info);
- audioOutputLine.open(audioFormat);
- audioOutputLine.start();
- }
- stateChange = State.PLAYING;
- break;
- case PAUSE:
- stateChange = State.PAUSED;
- break;
+ DataLine.Info info = new DataLine.Info(SourceDataLine.class, audioFormat);
+ audioOutputLine = (SourceDataLine) AudioSystem.getLine(info);
+ audioOutputLine.open(audioFormat);
+ audioOutputLine.start();
+ }
+ stateChange = State.PLAYING;
+ break;
+ case PAUSE:
+ stateChange = State.PAUSED;
+ break;
}
command.ok(stateChange);
@@ -335,5 +340,5 @@
public static void audioMalfunction(Exception ex) {
- JOptionPane.showMessageDialog(Main.parent,
+ OptionPaneUtil.showMessageDialog(Main.parent,
"" + tr(ex.getMessage()) + "
",
tr("Error playing sound"), JOptionPane.ERROR_MESSAGE);
Index: /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 1864)
+++ /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 1865)
@@ -20,6 +20,6 @@
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AboutAction;
import org.openstreetmap.josm.actions.ShowStatusReportAction;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
import org.openstreetmap.josm.plugins.PluginHandler;
@@ -39,8 +39,11 @@
if (e instanceof OutOfMemoryError) {
// do not translate the string, as translation may raise an exception
- JOptionPane.showMessageDialog(Main.parent, "JOSM is out of memory. " +
+ OptionPaneUtil.showMessageDialog(Main.parent, "JOSM is out of memory. " +
"Strange things may happen.\nPlease restart JOSM with the -Xmx###M option,\n" +
"where ### is the the number of MB assigned to JOSM (e.g. 256).\n" +
- "Currently, " + Runtime.getRuntime().maxMemory()/1024/1024 + " MB are available to JOSM.");
+ "Currently, " + Runtime.getRuntime().maxMemory()/1024/1024 + " MB are available to JOSM.",
+ tr("Error"),
+ JOptionPane.ERROR_MESSAGE
+ );
return;
}
@@ -50,10 +53,10 @@
Object[] options = new String[]{tr("Do nothing"), tr("Report Bug")};
- int answer = JOptionPane.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\n" +
- "This is always a coding error. If you are running the latest\n" +
+ int answer = OptionPaneUtil.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\n" +
+ "This is always a coding error. If you are running the latest\n" +
"version of JOSM, please consider being kind and file a bug report."),
tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE,
- null, options, options[0]);
- if (answer == 1) {
+ options, options[0]);
+ if (answer == JOptionPane.YES_OPTION) {
try {
StringWriter stack = new StringWriter();
@@ -65,7 +68,7 @@
JPanel p = new JPanel(new GridBagLayout());
p.add(new JLabel("" + tr("Please report a ticket at {0}","http://josm.openstreetmap.de/newticket") +
- "
" + tr("Include your steps to get to the error (as detailed as possible)!") +
- "
" + tr("Try updating to the newest version of JOSM and all plugins before reporting a bug.") +
- "
" + tr("Be sure to include the following information:") + ""), GBC.eol());
+ "
" + tr("Include your steps to get to the error (as detailed as possible)!") +
+ "
" + tr("Try updating to the newest version of JOSM and all plugins before reporting a bug.") +
+ "
" + tr("Be sure to include the following information:") + ""), GBC.eol());
try {
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(text), new ClipboardOwner(){
@@ -81,5 +84,5 @@
p.add(new JScrollPane(info), GBC.eop());
- JOptionPane.showMessageDialog(Main.parent, p);
+ OptionPaneUtil.showMessageDialog(Main.parent, p, tr("Warning"), JOptionPane.WARNING_MESSAGE);
} catch (Exception e1) {
e1.printStackTrace();
Index: /trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 1864)
+++ /trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 1865)
@@ -4,4 +4,5 @@
import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
import java.awt.event.KeyEvent;
@@ -30,7 +31,7 @@
*/
public class Shortcut {
-// public static final int SHIFT = KeyEvent.SHIFT_DOWN_MASK;
-// public static final int CTRL = KeyEvent.CTRL_DOWN_MASK;
-// public static final int SHIFT_CTRL = KeyEvent.SHIFT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK;
+ // public static final int SHIFT = KeyEvent.SHIFT_DOWN_MASK;
+ // public static final int CTRL = KeyEvent.CTRL_DOWN_MASK;
+ // public static final int SHIFT_CTRL = KeyEvent.SHIFT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK;
public static final int SHIFT_DEFAULT = 1;
private String shortText; // the unique ID of the shortcut
@@ -135,5 +136,7 @@
public void setAssignedUser(boolean assignedUser) {
this.reset = (!this.assignedUser && assignedUser);
- if (assignedUser) assignedDefault = false;
+ if (assignedUser) {
+ assignedDefault = false;
+ }
this.assignedUser = assignedUser;
}
@@ -215,11 +218,9 @@
// check if something collides with an existing shortcut
private static Shortcut findShortcut(int requestedKey, int modifier) {
- if (modifier == groups.get(GROUP_NONE)) {
+ if (modifier == groups.get(GROUP_NONE))
return null;
- }
for (Shortcut sc : shortcuts.values()) {
- if (sc.isSame(requestedKey, modifier)) {
+ if (sc.isSame(requestedKey, modifier))
return sc;
- }
}
return null;
@@ -238,7 +239,6 @@
for (int m : mods) {
for (int k = KeyEvent.VK_A; k < KeyEvent.VK_Z; k++) { // we'll limit ourself to 100% safe keys
- if ( findShortcut(k, m) == null ) {
+ if ( findShortcut(k, m) == null )
return new Shortcut(shortText, longText, requestedKey, requestedGroup, k, m, false, false);
- }
}
}
@@ -281,5 +281,7 @@
while (p != null) {
Shortcut sc = new Shortcut(p);
- if (sc.getAssignedUser()) registerShortcut(sc);
+ if (sc.getAssignedUser()) {
+ registerShortcut(sc);
+ }
i++;
p = Main.pref.get("shortcut.shortcut."+i, null);
@@ -290,5 +292,7 @@
while (p != null) {
Shortcut sc = new Shortcut(p);
- if (!sc.getAssignedUser() && sc.getAssignedDefault()) registerShortcut(sc);
+ if (!sc.getAssignedUser() && sc.getAssignedDefault()) {
+ registerShortcut(sc);
+ }
i++;
p = Main.pref.get("shortcut.shortcut."+i, null);
@@ -299,5 +303,7 @@
while (p != null) {
Shortcut sc = new Shortcut(p);
- if (!sc.getAssignedUser() && !sc.getAssignedDefault()) registerShortcut(sc);
+ if (!sc.getAssignedUser() && !sc.getAssignedDefault()) {
+ registerShortcut(sc);
+ }
i++;
p = Main.pref.get("shortcut.shortcut."+i, null);
@@ -307,11 +313,11 @@
// shutdown handling
public static void savePrefs() {
-// we save this directly from the preferences pane, so don't overwrite these values here
-// for (int i = GROUP_NONE; i < GROUP__MAX+GROUPS_ALT2; i++) {
-// Main.pref.put("shortcut.groups."+i, Groups.get(i).toString());
-// }
+ // we save this directly from the preferences pane, so don't overwrite these values here
+ // for (int i = GROUP_NONE; i < GROUP__MAX+GROUPS_ALT2; i++) {
+ // Main.pref.put("shortcut.groups."+i, Groups.get(i).toString());
+ // }
int i = 0;
for (Shortcut sc : shortcuts.values()) {
-// TODO: Remove sc.getAssignedUser() when we fixed all internal conflicts
+ // TODO: Remove sc.getAssignedUser() when we fixed all internal conflicts
if (!sc.getAutomatic() && !sc.getReset() && sc.getAssignedUser()) {
Main.pref.put("shortcut.shortcut."+i, sc.asPrefString());
@@ -326,9 +332,10 @@
// put a user configured shortcut in as-is -- unless there's a conflict
if(sc.getAssignedUser() && findShortcut(sc.getAssignedKey(),
- sc.getAssignedModifier()) == null)
+ sc.getAssignedModifier()) == null) {
shortcuts.put(sc.getShortText(), sc);
- else
+ } else {
registerShortcut(sc.getShortText(), sc.getLongText(), sc.getRequestedKey(),
- sc.getRequestedGroup(), sc.getAssignedModifier(), sc);
+ sc.getRequestedGroup(), sc.getAssignedModifier(), sc);
+ }
}
@@ -339,7 +346,6 @@
*/
public static Shortcut registerSystemShortcut(String shortText, String longText, int key, int modifier) {
- if (shortcuts.containsKey(shortText)) {
+ if (shortcuts.containsKey(shortText))
return shortcuts.get(shortText);
- }
Shortcut potentialShortcut = findShortcut(key, modifier);
if (potentialShortcut != null) {
@@ -391,8 +397,9 @@
Integer defaultModifier = groups.get(requestedGroup + GROUPS_DEFAULT);
if(modifier != null) {
- if(modifier == SHIFT_DEFAULT)
+ if(modifier == SHIFT_DEFAULT) {
defaultModifier |= KeyEvent.SHIFT_DOWN_MASK;
- else
+ } else {
defaultModifier = modifier;
+ }
}
else if (defaultModifier == null) { // garbage in, no shortcut out
@@ -437,5 +444,5 @@
// a lengthy warning message
private static void displayWarning(Shortcut conflictsWith, Shortcut potentialShortcut, String shortText, String longText) {
- JOptionPane.showMessageDialog(Main.parent,
+ OptionPaneUtil.showMessageDialog(Main.parent,
tr("Setting the keyboard shortcut ''{0}'' for the action ''{1}'' ({2}) failed\n"+
"because the shortcut is already taken by the action ''{3}'' ({4}).\n\n",
@@ -447,5 +454,7 @@
tr("Using the shortcut ''{0}'' instead.\n\n", potentialShortcut.getKeyText())
)+
- tr("(Hint: You can edit the shortcuts in the preferences.)")
+ tr("(Hint: You can edit the shortcuts in the preferences.)"),
+ tr("Error"),
+ JOptionPane.ERROR_MESSAGE
);
}