Changeset 210

Timestamp:

04/09/11 11:29:12 (14 months ago)

Author:

stefan

Message:

implemented issue #252: rename all occurrences of "COM port" to "serial port"

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/org/jergometer/communication/BikeConnectionTester.java (modified) (1 diff)
• src/org/jergometer/communication/BikeConnectorSerial.java (modified) (3 diffs)
• src/org/jergometer/communication/BikeException.java (modified) (1 diff)
• src/org/jergometer/communication/UnconfiguredSerialPortException.java (moved) (moved from trunk/src/org/jergometer/communication/UnconfiguredComPortException.java) (1 diff)
• src/org/jergometer/gui/SettingsWindow.form (modified) (1 diff)
• src/org/jergometer/gui/SettingsWindow.java (modified) (7 diffs)
• src/org/jergometer/Jergometer.java (modified) (4 diffs)
• src/org/jergometer/JergometerSettings.java (modified) (6 diffs)
• src/org/jergometer/translation/jergometer_de.properties (modified) (4 diffs)
• src/org/jergometer/translation/jergometer.properties (modified) (4 diffs)

trunk/CHANGELOG

@@ -5 +5 @@
 * [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
+            * implemented issue #252: rename all occurrences of "COM port" to "serial port"
 
 == 0.7.11 ==

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

@@ -50 +50 @@
           try {
             if(portId.isCurrentlyOwned()) {
-              System.out.println("COM port is currently owned by another application!");
+              System.out.println("Serial port is currently owned by another application!");
             }
             serialPort = (SerialPort) portId.open("BikeConnector", 2000);

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

@@ -49 +49 @@
 // dynamic
 
-  private String serialName;
   private SerialPort serialPort;
   private BikeReader reader = null;
@@ -59 +58 @@
 
   public void connect(String serialName) throws BikeException, UnsupportedCommOperationException, IOException {
-    this.serialName = serialName;
-
     Enumeration portList = CommPortIdentifier.getPortIdentifiers();
 
@@ -69 +66 @@
         if(portId.getName().equals(serialName)) {
           if(portId.isCurrentlyOwned()) {
-            throw new BikeException(I18n.getString("msg.com_port_used_by_the_following_application", portId.getCurrentOwner()));
+            throw new BikeException(I18n.getString("msg.serial_port_used_by_the_following_application", portId.getCurrentOwner()));
           }
           try {
             serialPort = (SerialPort) portId.open("JErgometer", 2000);
           } catch (PortInUseException e) {
-            throw new BikeException(I18n.getString("msg.com_port_used_by_the_following_application", portId.getCurrentOwner()));
+            throw new BikeException(I18n.getString("msg.serial_port_used_by_the_following_application", portId.getCurrentOwner()));
           }
 

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

@@ -4 +4 @@
 
 /**
- * Special IO exception related to the COM port connection to the ergometer.
+ * Special IO exception related to the serial port connection to the ergometer.
  */
 public class BikeException extends Exception {

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

@@ -2 +2 @@
 
 /**
- * Unconfigured COM port exception.
+ * Unconfigured serial port exception.
  */
-public class UnconfiguredComPortException extends Exception {
-  public UnconfiguredComPortException() {
-    super("The COM port has not been configured yet.");
+public class UnconfiguredSerialPortException extends Exception {
+  public UnconfiguredSerialPortException() {
+    super("The serial port has not been configured yet.");
   }
 }

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

@@ -22 +22 @@
             </constraints>
             <properties>
-              <text resource-bundle="org/jergometer/translation/jergometer" key="settings.com_port"/>
+              <text resource-bundle="org/jergometer/translation/jergometer" key="settings.serial_port"/>
             </properties>
           </component>

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

@@ -46 +46 @@
     panel1.setBorder(BorderFactory.createTitledBorder(ResourceBundle.getBundle("org/jergometer/translation/jergometer").getString("label.global_settings")));
     final JLabel label1 = new JLabel();
-    this.$$$loadLabelText$$$(label1, ResourceBundle.getBundle("org/jergometer/translation/jergometer").getString("settings.com_port"));
+    this.$$$loadLabelText$$$(label1, ResourceBundle.getBundle("org/jergometer/translation/jergometer").getString("settings.serial_port"));
     gbc = new GridBagConstraints();
     gbc.gridx = 0;
@@ -296 +296 @@
     updatePortsButton.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
-        updateComPorts(null);
+        updateSerialPorts(null);
       }
     });
@@ -316 +316 @@
           @Override
           public void run() {
-            testComPort(settingsWindow);
+            testSerialPort(settingsWindow);
           }
         }.start();
@@ -339 +339 @@
   }
 
-  private void testComPort(final SettingsWindow settingsWindow) {
+  private void testSerialPort(final SettingsWindow settingsWindow) {
     BikeConnectionTester bikeConnectionTester = new BikeConnectionTester(settingsWindow, comPortComboBox.getSelectedItem().toString());
     String id = bikeConnectionTester.test();
@@ -356 +356 @@
    */
   public ReturnCode showDialog(JergometerSettings settings) {
-    updateComPorts(settings);
+    updateSerialPorts(settings);
 
     if (settings != null) {
@@ -372 +372 @@
   }
 
-  private void updateComPorts(JergometerSettings settings) {
+  private void updateSerialPorts(JergometerSettings settings) {
     String comPort = null;
     if (settings != null) {
-      comPort = settings.getComPort();
+      comPort = settings.getSerialPort();
     }
     int comPortIndex = -1;
@@ -413 +413 @@
   public void saveSettings(JergometerSettings settings) {
     settings.setCheckForUpdatesOnStart(checkForUpdatesOnStartCheckBox.isSelected());
-    settings.setComPort((String) comPortComboBox.getSelectedItem());
+    settings.setSerialPort((String) comPortComboBox.getSelectedItem());
     settings.setXmlEditor(xmlEditorTextField.getText());
   }

trunk/src/org/jergometer/Jergometer.java

@@ -188 +188 @@
   /**
    * Connects to the serial port.
-   */
-  private void connectToSerialPort() throws BikeException, UnsupportedCommOperationException, IOException, UnconfiguredComPortException {
-    String comPort = jergometerSettings.getComPort();
+   *
+   * @throws gnu.io.UnsupportedCommOperationException if communication operation is not supported
+   * @throws java.io.IOException if an I/O error occurs
+   * @throws org.jergometer.communication.BikeException if the bike communication fails
+   * @throws org.jergometer.communication.UnconfiguredSerialPortException if the serial port is not configured yet
+   */
+  private void connectToSerialPort() throws BikeException, UnsupportedCommOperationException, IOException, UnconfiguredSerialPortException {
+    String comPort = jergometerSettings.getSerialPort();
     if (comPort == null) {
-      throw new UnconfiguredComPortException();
+      throw new UnconfiguredSerialPortException();
     }
     bikeConnector = new BikeConnectorSerial(comPort);
@@ -360 +365 @@
         JOptionPane.showMessageDialog(mainWindow, e.getMessage(), I18n.getString("error_dialog.title"), JOptionPane.ERROR_MESSAGE);
         return;
-      } catch (UnconfiguredComPortException e) {
+      } catch (UnconfiguredSerialPortException e) {
         e.printStackTrace();
         JOptionPane.showMessageDialog(mainWindow, I18n.getString("msg.configure_comport_first"));
@@ -480 +485 @@
     for (BikeSession selectedSession : selectedSessions) {
       this.userData.getSessions().remove(selectedSession);
+      //noinspection ResultOfMethodCallIgnored
       selectedSession.getFile().delete();
     }
@@ -490 +496 @@
    *
    * @param bikeSession bike session
+   * @throws java.io.IOException if an I/O error occurs
    */
   private void visualizeBikeSession(BikeSession bikeSession) throws IOException {

trunk/src/org/jergometer/JergometerSettings.java

@@ -15 +15 @@
  * Jergometer settings.
  */
+@SuppressWarnings({"ResultOfMethodCallIgnored"})
 public class JergometerSettings {
 
@@ -47 +48 @@
   private ArrayList<String> userNames = new ArrayList<String>();
   private String lastUserName;
-  private String comPort;
+  private String serialPort;
   private String xmlEditor;
 
@@ -138 +139 @@
 
     lastUserName = properties.getString("last_user");
-    comPort = properties.getString("comport");
+    serialPort = properties.getString("comport");
     xmlEditor = properties.getString("xml_editor");
 
@@ -152 +153 @@
         if (users != null) lastUserName = users.getAttribute("lastUser");
         XMLElement comport = root.getChildElement("comport");
-        if (comport != null) comPort = comport.getAttribute("name");
+        if (comport != null) serialPort = comport.getAttribute("name");
         XMLElement xmlEditor = root.getChildElement("xmlEditor");
         if (xmlEditor != null) this.xmlEditor = xmlEditor.getAttribute("name");
@@ -174 +175 @@
 
     properties.setString("last_user", lastUserName);
-    properties.setString("comport", comPort);
+    properties.setString("comport", serialPort);
     properties.setString("xml_editor", xmlEditor);
 
@@ -241 +242 @@
   }
 
-  public String getComPort() {
-    return comPort;
-  }
-
-  public void setComPort(String comPort) {
-    this.comPort = comPort;
+  public String getSerialPort() {
+    return serialPort;
+  }
+
+  public void setSerialPort(String serialPort) {
+    this.serialPort = serialPort;
   }
 

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

@@ -89 +89 @@
   </html>
 label.global_settings=Globale Einstellungen
-settings.com_port=COM-Port:
-settings.enter_port_name=Lass mich den Namen eingeben
-settings.update_ports=Aktualisieren
-settings.test_port=Testen
+settings.serial_port=Serial-Port:
+settings.enter_port_name=Lass mich den Namen &eingeben
+settings.update_ports=Akt&ualisieren
+settings.test_port=&Testen
 settings.update=Update:
-settings.check_for_updates_on_start=Suche nach neuen Versionen beim Start
-label.save=Speichern
-label.abort=Abbrechen
+settings.check_for_updates_on_start=Suche beim Start nach neuen &Versionen von JErgometer
+label.save=&Speichern
+label.abort=&Abbrechen
 settings_dialog.title=JErgometer-Einstellungen
-msg.configure_comport_first=Bitte geben Sie zunächst den COM-Port zur Datenübertragung an!
+msg.configure_comport_first=Bitte konfigurieren Sie zunächst den seriellen Port für die Kommunikation mit dem Ergometer!
 msg.not_implemented_yet=Diese Funktion ist noch nicht implementiert.
 menu.sessions.delete_selected=Lösche selektierte
@@ -109 +109 @@
 choose_new_program_dialog.explanation=Dies könnte durch die Löschung oder Umbenennung von Trainingsprogrammen entstanden sein. Falls es sich nur um eine Umbenennung handelt, können Sie den betroffenen Sitzungen nun das zugehörige Programm zuweisen.
 choose_new_program_dialog.title=Neues Programm auswählen
-msg.connection_failed=Verbindung zum Ergometer fehlgeschlagen! Weitere Informationen finden Sie im Konsolenfenster.\nUm das Problem zu beheben, sollten Sie Ihre COM-Port-Konfiguration (siehe Einstellungen) überprüfen.
+msg.connection_failed=Verbindung zum Ergometer fehlgeschlagen! Weitere Informationen finden Sie im Konsolenfenster.\nUm das Problem zu beheben, sollten Sie Ihre Serial-Port-Konfiguration (siehe Einstellungen) überprüfen.
 connection_tester.testing_connection_to_ergometer=Teste Verbindung zum Ergometer...
 connection_tester.connection_successful=Verbindung zum Ergometer war erfolgreich! (ID=%s)
@@ -116 +116 @@
 connection_tester.wait_for_reset_finished=Warte auf Reset-Ende
 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.serial_port_used_by_the_following_application=Der serielle Port wird derzeit von der Anwendung "%s" genutzt!
 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!
@@ -144 +144 @@
 main_window.title=JErgometer %s
 label.xml_editor=XML-Editor:
-label.file_choosing=>>>
+label.file_choosing=&>>>
 msg.error_during_execution_of=Fehler während der Ausführung von "%s"!
 msg.could_not_open_xml_editor=XML-Editor konnte nicht geöffnet werden

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

@@ -68 +68 @@
 about_dialog.text=<html><head><style>body { color: #000000; }th { text-align: left; }.vm { font-size:8px; margin-left: 10px; margin-top: 6px; } </style></head><body><br><br><table><tr><th>Version:</th><td>%1s</td></tr><tr><th>Website:</th><td>www.jergometer.org</td></tr><tr><th>Authors:</th><td>Stefan Endrullis,</td></tr><tr><th></th><td>Jörg Endrullis</td></tr><tr><th>License:</th><td>GPLv2</td></tr><tr><th>Java Version:</th><td>%2s</td></tr></table> <div class="vm">%3s</div></body></html>
 label.global_settings=Global Settings
-settings.com_port=COM port:
-settings.enter_port_name=Let me enter the port name
-settings.update_ports=Update
-settings.test_port=Test
+settings.serial_port=Serial port:
+settings.enter_port_name=Let me &enter the port name
+settings.update_ports=&Update
+settings.test_port=&Test
 settings.update=Update:
-settings.check_for_updates_on_start=Check for updates on start
-label.save=Save
-label.abort=Abort
+settings.check_for_updates_on_start=&Check for updates on start
+label.save=&Save
+label.abort=&Abort
 settings_dialog.title=JErgometer settings
-msg.configure_comport_first=Please configure the COM port first!
+msg.configure_comport_first=Please configure the serial port first!
 msg.not_implemented_yet=This function is not implemented yet.
 menu.sessions.delete_selected=Delete selected
@@ -88 +88 @@
 label.skip=Skip
 choose_new_program_dialog.title=Choose a new program
-msg.connection_failed=Connection to ergometer failed! See console output for additional information.\nTo solve this problem take a look at your COM port configuration (see settings).
+msg.connection_failed=Connection to ergometer failed! See console output for additional information.\nTo solve this problem take a look at your serial port configuration (see settings).
 connection_tester.testing_connection_to_ergometer=Testing connection to ergometer...
 connection_tester.connection_successful=Connection to ergoemter was successful! (ID=%s)
@@ -95 +95 @@
 connection_tester.wait_for_reset_finished=Waiting for reset finished
 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.serial_port_used_by_the_following_application=Serial port is currently owned by application "%s"!
 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!
@@ -123 +123 @@
 main_window.title=JErgometer %s
 label.xml_editor=XML editor:
-label.file_choosing=>>>
+label.file_choosing=&>>>
 msg.error_during_execution_of=Error during execution of "%s"!
 msg.could_not_open_xml_editor=Could not open XML editor