Changeset 10463 in josm
- Timestamp:
- 2016-06-23T02:35:10+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/Main.java
r10442 r10463 1013 1013 } catch (final NoClassDefFoundError | ClassNotFoundException e) { 1014 1014 // Try to find look and feel in plugin classloaders 1015 Main.trace(e); 1015 1016 Class<?> klass = null; 1016 1017 for (ClassLoader cl : PluginHandler.getResourceClassLoaders()) { … … 1019 1020 break; 1020 1021 } catch (ClassNotFoundException ex) { 1021 if (Main.isTraceEnabled()) { 1022 Main.trace(ex.getMessage()); 1023 } 1022 Main.trace(ex); 1024 1023 } 1025 1024 } … … 1028 1027 UIManager.setLookAndFeel((LookAndFeel) klass.getConstructor().newInstance()); 1029 1028 } catch (ReflectiveOperationException ex) { 1030 warn( "Cannot set Look and Feel: " + laf + ": "+ex.getMessage());1029 warn(ex, "Cannot set Look and Feel: " + laf + ": "+ex.getMessage()); 1031 1030 } catch (UnsupportedLookAndFeelException ex) { 1032 1031 info("Look and Feel not supported: " + laf); 1033 1032 Main.pref.put("laf", defaultlaf); 1033 trace(ex); 1034 1034 } 1035 1035 } else { … … 1040 1040 info("Look and Feel not supported: " + laf); 1041 1041 Main.pref.put("laf", defaultlaf); 1042 trace(e); 1042 1043 } catch (InstantiationException | IllegalAccessException e) { 1043 1044 error(e); … … 1065 1066 CoordinateFormat.setCoordinateFormat(CoordinateFormat.valueOf(Main.pref.get("coordinates"))); 1066 1067 } catch (IllegalArgumentException iae) { 1068 Main.trace(iae); 1067 1069 CoordinateFormat.setCoordinateFormat(CoordinateFormat.DECIMAL_DEGREES); 1068 1070 } 1069 1070 1071 } 1071 1072 … … 1218 1219 f = new File(new URI(s)); 1219 1220 } catch (URISyntaxException e) { 1221 Main.warn(e); 1220 1222 JOptionPane.showMessageDialog( 1221 1223 Main.parent, -
trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
r10373 r10463 29 29 import org.openstreetmap.josm.io.imagery.WMSImagery; 30 30 import org.openstreetmap.josm.io.imagery.WMSImagery.LayerDetails; 31 import org.openstreetmap.josm.io.imagery.WMSImagery.WMSGetCapabilitiesException; 31 32 import org.openstreetmap.josm.tools.GBC; 32 33 import org.openstreetmap.josm.tools.ImageProvider; … … 151 152 } 152 153 Main.error(ex, false); 153 } catch (WMS Imagery.WMSGetCapabilitiesException ex) {154 } catch (WMSGetCapabilitiesException ex) { 154 155 if (!GraphicsEnvironment.isHeadless()) { 155 156 JOptionPane.showMessageDialog(Main.parent, tr("Could not parse WMS layer list."), 156 157 tr("WMS Error"), JOptionPane.ERROR_MESSAGE); 157 158 } 158 Main.error( "Could not parse WMS layer list. Incoming data:\n"+ex.getIncomingData());159 Main.error(ex, "Could not parse WMS layer list. Incoming data:\n"+ex.getIncomingData()); 159 160 } 160 161 return null; -
trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java
r10383 r10463 208 208 209 209 } catch (InvalidSelection except) { 210 Main.debug(except); 210 211 new Notification(except.getMessage()) 211 212 .setIcon(JOptionPane.INFORMATION_MESSAGE) -
trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
r10382 r10463 224 224 combineResult = combineWaysWorker(selectedWays); 225 225 } catch (UserCancelException ex) { 226 Main.trace(ex); 226 227 return; 227 228 } -
trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
r10407 r10463 67 67 importers.add(importer); 68 68 } catch (ReflectiveOperationException e) { 69 if (Main.isDebugEnabled()) { 70 Main.debug(e.getMessage()); 71 } 69 Main.debug(e); 72 70 } catch (ServiceConfigurationError e) { 73 71 // error seen while initializing WMSLayerImporter in plugin unit tests: … … 108 106 Main.getLayerManager().addAndFireActiveLayerChangeListener(exporter); 109 107 } catch (ReflectiveOperationException e) { 110 if (Main.isDebugEnabled()) { 111 Main.debug(e.getMessage()); 112 } 108 Main.debug(e); 113 109 } catch (ServiceConfigurationError e) { 114 110 // see above in importers initialization -
trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
r10457 r10463 508 508 } 509 509 } catch (UserCancelException exception) { 510 Main.trace(exception); 510 511 //revert changes 511 512 //FIXME: this is dirty hack … … 681 682 return true; 682 683 } catch (UserCancelException ex) { 684 Main.trace(ex); 683 685 return false; 684 686 } -
trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java
r10436 r10463 191 191 break outer; 192 192 } catch (IllegalStateException ex) { 193 Main.error(ex .getMessage());193 Main.error(ex, false); 194 194 } 195 195 } -
trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java
r10448 r10463 346 346 trn("Merge {0} node", "Merge {0} nodes", nodes.size(), nodes.size()), cmds); 347 347 } catch (UserCancelException ex) { 348 Main.trace(ex); 348 349 return null; 349 350 } -
trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
r10383 r10463 118 118 } 119 119 } catch (InvalidUserInputException ex) { 120 Main.debug(ex); 120 121 new Notification( 121 122 tr("Orthogonalize Shape / Undo<br>"+ … … 154 155 Main.map.repaint(); 155 156 } catch (InvalidUserInputException ex) { 157 Main.debug(ex); 156 158 String msg; 157 159 if ("usage".equals(ex.getMessage())) { -
trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java
r10382 r10463 96 96 revResult = reverseWay(w); 97 97 } catch (UserCancelException ex) { 98 Main.trace(ex); 98 99 return; 99 100 } -
trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
r10446 r10463 136 136 } 137 137 } catch (SecurityException e) { 138 if (Main.isTraceEnabled()) { 139 Main.trace(e.getMessage()); 140 } 138 Main.trace(e); 141 139 } 142 140 List<String> commandLineArgs = Main.getCommandLineArgs(); -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
r10436 r10463 21 21 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 22 22 import org.openstreetmap.josm.io.BoundingBoxDownloader; 23 import org.openstreetmap.josm.io.BoundingBoxDownloader.MoreNotesException; 23 24 import org.openstreetmap.josm.io.OsmApi; 24 25 import org.openstreetmap.josm.io.OsmServerLocationReader; … … 147 148 try { 148 149 notesData = reader.parseNotes(DOWNLOAD_LIMIT.get(), DAYS_CLOSED.get(), subMonitor); 149 } catch (BoundingBoxDownloader.MoreNotesException e) { 150 } catch (MoreNotesException e) { 151 Main.debug(e); 150 152 notesData = e.notes; 151 153 JOptionPane.showMessageDialog(Main.parent, "<html>" -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
r10308 r10463 181 181 data.setVisible(hp.isVisible()); 182 182 } catch (IllegalStateException e) { 183 Main.error( "Cannot change visibility for "+p+": "+e.getMessage());183 Main.error(e, "Cannot change visibility for "+p+':'); 184 184 } 185 185 data.setTimestamp(hp.getTimestamp()); … … 193 193 it.remove(); 194 194 } catch (AssertionError e) { 195 Main.error( "Cannot load "+p + ": " + e.getMessage());195 Main.error(e, "Cannot load "+p+':'); 196 196 } 197 197 } -
trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
r10413 r10463 1195 1195 + (unitvector.getY() * linelength))); 1196 1196 } catch (NoninvertibleTransformException e) { 1197 Main.debug(e); 1197 1198 return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * 10), start.getY() 1198 1199 + (unitvector.getY() * 10))); -
trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
r10382 r10463 546 546 return true; 547 547 } catch (IllegalArgumentException e) { 548 Main.debug(e); 548 549 new Notification(tr("ParallelWayAction\n" + 549 550 "The ways selected must form a simple branchless path")) -
trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
r10459 r10463 351 351 super.buttonAction(buttonIndex, evt); 352 352 } catch (ParseError e) { 353 Main.debug(e); 353 354 JOptionPane.showMessageDialog( 354 355 Main.parent, … … 704 705 } 705 706 subMonitor.finishTask(); 706 } catch (SearchCompiler.ParseError e) { 707 } catch (ParseError e) { 708 Main.debug(e); 707 709 JOptionPane.showMessageDialog( 708 710 Main.parent, -
trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java
r10446 r10463 42 42 } 43 43 } catch (OsmTransferCanceledException e) { 44 Main.trace(e); 44 45 return false; 45 46 } catch (OsmApiInitializationException e) {
Note:
See TracChangeset
for help on using the changeset viewer.