Changeset 976 in josm

Timestamp:

Sep 16, 2008 6:29:35 PM (5 years ago)

Author:

stoecker

Message:

fix bug #1561 and #5160

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/SplashScreen.java (added)
• styles/standard/elemstyles.xml (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -104 +104 @@
 
                 if(!isZoomOk(wayStyle))
+                        return;
+                if(w.nodes.size() < 2)
                         return;
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -206 +206 @@
          */
         public void visit(Way w) {
-                if (w.incomplete) return;
-
-                                // show direction arrows, if draw.segment.relevant_directions_only is not set, the way is tagged with a direction key
-                                // (even if the tag is negated as in oneway=false) or the way is selected
-
-                                boolean showThisDirectionArrow = w.selected
-                                                                                                 || (showDirectionArrow
-                                                                                                         && (!showRelevantDirectionsOnly || w.hasDirectionKeys));
+                if (w.incomplete || w.nodes.size() < 2)
+                        return;
+
+                // show direction arrows, if draw.segment.relevant_directions_only is not set, the way is tagged with a direction key
+                // (even if the tag is negated as in oneway=false) or the way is selected
+
+                boolean showThisDirectionArrow = w.selected
+                || (showDirectionArrow && (!showRelevantDirectionsOnly || w.hasDirectionKeys));
                 Color wayColor;
 

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -35 +35 @@
          */
         public MainApplication(JFrame mainFrame) {
+                super();
                 mainFrame.setContentPane(contentPane);
                 mainFrame.setJMenuBar(menu);
@@ -82 +83 @@
                 }
 
+                // Only show the splash screen if we don't print the help and exit
+                SplashScreen splash;
+                if (!argList.contains("--help") && !argList.contains("-?") && !argList.contains("-h")) {
+                        splash = new SplashScreen();
+                } else {
+                        splash = null;
+                }
+
+                splash.setStatus(tr("Reading preferences"));
                 // get the preferences.
                 final File prefDir = new File(Main.pref.getPreferencesDir());
@@ -123 +133 @@
                         language = (String)(args.get("language").toArray()[0]);
 
+                splash.setStatus(tr("Activating updated plugins"));
                 if (!PluginDownloader.moveUpdatedPlugins()) {
                         JOptionPane.showMessageDialog(null,
-                                tr("Activating the updated plugins failed."),
+                                tr("Activating the updated plugins failed. Check if JOSM has the permission to overwrite the existing ones."),
                                 tr("Plugins"), JOptionPane.ERROR_MESSAGE);
                 }
                 
                 // load the early plugins
+                splash.setStatus(tr("Loading early plugins"));
                 Main.loadPlugins(true, language);
 
@@ -159 +171 @@
                 }
 
+                splash.setStatus(tr("Setting defaults"));
                 preConstructorInit(args);
+                splash.setStatus(tr("Creating main GUI"));
                 JFrame mainFrame = new JFrame(tr("Java OpenStreetMap - Editor"));
                 Main.parent = mainFrame;
                 final Main main = new MainApplication(mainFrame);
+                splash.setStatus(tr("Loading plugins"));
                 Main.loadPlugins(false, null);
                 toolbar.refreshToolbarControl();
 
                 mainFrame.setVisible(true);
+                splash.closeSplash();
 
                 if (!args.containsKey("no-fullscreen") && !args.containsKey("geometry") && Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH))

trunk/styles/standard/elemstyles.xml

@@ -603 +603 @@
         <rule>
                 <condition k="highway" v="turning_circle"/>
-                <area width="1" colour="roundabout#c0c0c0"/>
+                <area width="1" colour="turningcircle#c0c0c0"/>
                 <icon annotate="true" src="vehicle/turning_circle.png"/>
                 <scale_min>1</scale_min>