Changeset 209

Timestamp:

04/09/11 10:46:22 (14 months ago)

Author:

stefan

Message:

implemented issue #247: display error message when JErgometer is started without RXTX library

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/org/jergometer/communication/BikeConnectorSerial.java (modified) (2 diffs)
• src/org/jergometer/gui/SettingsWindow.java (modified) (3 diffs)
• src/org/jergometer/Jergometer.java (modified) (1 diff)
• src/org/jergometer/translation/jergometer_de.properties (modified) (1 diff)
• src/org/jergometer/translation/jergometer.properties (modified) (1 diff)

trunk/CHANGELOG

@@ -4 +4 @@
 == coming 0.7.12 ==
 * [stefan]  * fixed bug #182: JErgometer wants to update even if it's a bleeding edge version
+            * implemented issue #247: display error message when JErgometer is started without RXTX library
 
 == 0.7.11 ==

trunk/src/org/jergometer/communication/BikeConnectorSerial.java

@@ -8 +8 @@
 
 import org.jergometer.translation.I18n;
+
+import javax.swing.*;
 
 /**
@@ -23 +25 @@
       driver.initialize();
     } catch (Exception e) {
-      System.out.println("Didn't find " + driverName);
+      System.err.println("Could not load serial port driver \"" + driverName + "\".");
+      e.printStackTrace();
     }
   }

trunk/src/org/jergometer/gui/SettingsWindow.java

@@ -15 +15 @@
  */
 public class SettingsWindow extends JDialog {
+
+
   {
 // GUI initializer generated by IntelliJ IDEA GUI Designer
@@ -258 +260 @@
   }
 
-
   public enum ReturnCode {
     abort, save
@@ -380 +381 @@
     DefaultComboBoxModel comboBoxModel = new DefaultComboBoxModel();
     int i = 0;
-    for (String s : BikeConnectorSerial.getPortNames()) {
-      comboBoxModel.addElement(s);
-      // check if this comport this the current comport
-      if (comPort != null && s.equals(comPort)) {
-        comPortIndex = i;
-      }
-      i++;
-    }
+
+    try {
+      // detect available serial ports
+      for (String s : BikeConnectorSerial.getPortNames()) {
+        comboBoxModel.addElement(s);
+        // check if this comport this the current comport
+        if (comPort != null && s.equals(comPort)) {
+          comPortIndex = i;
+        }
+        i++;
+      }
+    } catch (NoClassDefFoundError ignored) {
+    } catch (UnsatisfiedLinkError e) {
+      e.printStackTrace();
+      JOptionPane.showMessageDialog(this, I18n.getString("msg.unsatisfied_link_error"), I18n.getString("error_dialog.title"), JOptionPane.ERROR_MESSAGE);
+    } catch (Exception e) {
+      e.printStackTrace();
+      JOptionPane.showMessageDialog(this, I18n.getString("msg.connection_failed"), I18n.getString("error_dialog.title"), JOptionPane.ERROR_MESSAGE);
+    }
+
     // if comport is not in the list -> add it
     if (comPort != null && comPortIndex == -1) {

trunk/src/org/jergometer/Jergometer.java

@@ -364 +364 @@
         JOptionPane.showMessageDialog(mainWindow, I18n.getString("msg.configure_comport_first"));
         mainWindow.openSettingsWindow();
+      } catch (NoClassDefFoundError e) {
+        JOptionPane.showMessageDialog(mainWindow, I18n.getString("msg.unsatisfied_link_error"), I18n.getString("error_dialog.title"), JOptionPane.ERROR_MESSAGE);
+        return;
       } catch (UnsatisfiedLinkError e) {
         e.printStackTrace();

trunk/src/org/jergometer/translation/jergometer_de.properties

@@ -117 +117 @@
 connection_tester.retrieving_ergometer_id=Hole Ergometer-ID
 msg.com_port_used_by_the_following_application=Der COM-Port wird derzeit von der Anwendung "%s" genutzt!
-msg.unsatisfied_link_error=JErgometer konnte leider nicht die richtige COM-Port-Bibliothek für Ihr Betriebssystem laden.\nBitte melden Sie das Problem dem Entwickler, indem Sie ihm eine Mail schreiben oder auf jergometer.org ein neues Ticket zu dem Problem anlegen.\nVergessen Sie dabei bitte nicht, Ihr Betriebsystem und die Fehlerausschriften im Konsolenfenster anzugeben. Danke.
+msg.unsatisfied_link_error=JErgometer konnte leider nicht die Serial-Port-Bibliothek für Ihr Betriebssystem laden.\nBitte melden Sie das Problem dem Entwickler, indem Sie ihm eine Mail schreiben oder auf jergometer.org ein einen Fehlerbericht (neues Ticket) verfassen.\nVergessen Sie dabei bitte nicht, Ihr Betriebsystem und die Fehlerausschriften im Konsolenfenster anzugeben. Danke.
 error_dialog.title=Fehler!
 menu.programs.edit=Editieren

trunk/src/org/jergometer/translation/jergometer.properties

@@ -96 +96 @@
 connection_tester.retrieving_ergometer_id=Retrieving ergometer id
 msg.com_port_used_by_the_following_application=COM port is currently owned by application "%s"!
-msg.unsatisfied_link_error=JErgometer could not load the correct COM port library for your operating system.\nPlease file a bug report on jergometer.org and include the console output and the major information about your OS. Thanks.
+msg.unsatisfied_link_error=JErgometer could not load the serial port library for your operating system.\nPlease file a bug report on jergometer.org and include the console output and the info which OS you are using. Thanks.
 error_dialog.title=Error!
 menu.programs.edit=Edit