diff --git a/apps/desktopgui/nbproject/genfiles.properties b/apps/desktopgui/nbproject/genfiles.properties index 20e01e830..f6b0f837b 100644 --- a/apps/desktopgui/nbproject/genfiles.properties +++ b/apps/desktopgui/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=9785bb9a build.xml.stylesheet.CRC32=be360661 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=c4b345cd +nbproject/build-impl.xml.data.CRC32=f630f8db nbproject/build-impl.xml.script.CRC32=8c02c081 nbproject/build-impl.xml.stylesheet.CRC32=65b8de21 diff --git a/apps/desktopgui/nbproject/project.properties b/apps/desktopgui/nbproject/project.properties index b7a05f8ed..e9f5d1a2a 100644 --- a/apps/desktopgui/nbproject/project.properties +++ b/apps/desktopgui/nbproject/project.properties @@ -58,7 +58,7 @@ jnlp.codebase.url=file:/home/mathias/Documenten/Programmeren/i2p_monotone/repo/i jnlp.enabled=false jnlp.offline-allowed=false jnlp.signed=false -main.class=desktopgui.Main +main.class=net.i2p.desktopgui.desktopgui.Main manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF platform.active=default_platform diff --git a/apps/desktopgui/nbproject/project.xml b/apps/desktopgui/nbproject/project.xml index 09409a64c..9dba9493c 100644 --- a/apps/desktopgui/nbproject/project.xml +++ b/apps/desktopgui/nbproject/project.xml @@ -13,7 +13,7 @@ - + diff --git a/apps/desktopgui/src/desktopgui/GUIVersion.java b/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/GUIVersion.java similarity index 84% rename from apps/desktopgui/src/desktopgui/GUIVersion.java rename to apps/desktopgui/src/net/i2p/desktopgui/desktopgui/GUIVersion.java index d90713bc8..f4e948e52 100644 --- a/apps/desktopgui/src/desktopgui/GUIVersion.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/GUIVersion.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package desktopgui; +package net.i2p.desktopgui.desktopgui; /** * diff --git a/apps/desktopgui/src/desktopgui/Main.java b/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/Main.java similarity index 95% rename from apps/desktopgui/src/desktopgui/Main.java rename to apps/desktopgui/src/net/i2p/desktopgui/desktopgui/Main.java index 9d9708c8d..c3078163d 100644 --- a/apps/desktopgui/src/desktopgui/Main.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/Main.java @@ -1,4 +1,4 @@ -package desktopgui; +package net.i2p.desktopgui.desktopgui; /* * Main.java @@ -6,8 +6,8 @@ package desktopgui; -import gui.Tray; -import gui.SpeedSelector; +import net.i2p.desktopgui.gui.Tray; +import net.i2p.desktopgui.gui.SpeedSelector; import java.awt.SystemTray; import java.util.Properties; import java.util.logging.Level; @@ -16,7 +16,7 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import org.jdesktop.application.Application; import org.jdesktop.application.SingleFrameApplication; -import persistence.PropertyManager; +import net.i2p.desktopgui.persistence.PropertyManager; /** * The main class of the application. diff --git a/apps/desktopgui/src/desktopgui/resources/Main.properties b/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/resources/Main.properties similarity index 100% rename from apps/desktopgui/src/desktopgui/resources/Main.properties rename to apps/desktopgui/src/net/i2p/desktopgui/desktopgui/resources/Main.properties diff --git a/apps/desktopgui/src/desktopgui/resources/Main_nl_BE.properties b/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/resources/Main_nl_BE.properties similarity index 100% rename from apps/desktopgui/src/desktopgui/resources/Main_nl_BE.properties rename to apps/desktopgui/src/net/i2p/desktopgui/desktopgui/resources/Main_nl_BE.properties diff --git a/apps/desktopgui/src/gui/GeneralConfiguration.form b/apps/desktopgui/src/net/i2p/desktopgui/gui/GeneralConfiguration.form similarity index 86% rename from apps/desktopgui/src/gui/GeneralConfiguration.form rename to apps/desktopgui/src/net/i2p/desktopgui/gui/GeneralConfiguration.form index 1b70c5adf..7c0fc8edc 100644 --- a/apps/desktopgui/src/gui/GeneralConfiguration.form +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/GeneralConfiguration.form @@ -16,6 +16,7 @@ + @@ -305,20 +306,20 @@ - + - + - + - - - + + + @@ -326,7 +327,7 @@ - + @@ -335,75 +336,75 @@ - + - + - + - + - - + + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + @@ -426,11 +427,11 @@ - - - - - + + + + + @@ -440,51 +441,51 @@ - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + diff --git a/apps/desktopgui/src/gui/GeneralConfiguration.java b/apps/desktopgui/src/net/i2p/desktopgui/gui/GeneralConfiguration.java similarity index 77% rename from apps/desktopgui/src/gui/GeneralConfiguration.java rename to apps/desktopgui/src/net/i2p/desktopgui/gui/GeneralConfiguration.java index d1ff4bbe7..910ca21fb 100644 --- a/apps/desktopgui/src/gui/GeneralConfiguration.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/GeneralConfiguration.java @@ -4,9 +4,9 @@ * Created on 10 april 2009, 19:04 */ -package gui; +package net.i2p.desktopgui.gui; -import router.configuration.SpeedHelper; +import net.i2p.desktopgui.router.configuration.SpeedHelper; /** * @@ -55,24 +55,24 @@ public class GeneralConfiguration extends javax.swing.JFrame { jLabel6 = new javax.swing.JLabel(); jLabel7 = new javax.swing.JLabel(); updatesPanel = new javax.swing.JPanel(); - jLabel8 = new javax.swing.JLabel(); - jRadioButton1 = new javax.swing.JRadioButton(); - jRadioButton2 = new javax.swing.JRadioButton(); - jRadioButton3 = new javax.swing.JRadioButton(); - jToggleButton1 = new javax.swing.JToggleButton(); - jToggleButton2 = new javax.swing.JToggleButton(); - jToggleButton3 = new javax.swing.JToggleButton(); + updateMethod = new javax.swing.JLabel(); + updateInform = new javax.swing.JRadioButton(); + updateDownload = new javax.swing.JRadioButton(); + updateDownloadRestart = new javax.swing.JRadioButton(); + checkUpdates = new javax.swing.JToggleButton(); + updateNow = new javax.swing.JToggleButton(); + advancedUpdateConfig = new javax.swing.JToggleButton(); tunnelPanel = new javax.swing.JPanel(); - jScrollPane1 = new javax.swing.JScrollPane(); - jScrollPane2 = new javax.swing.JScrollPane(); - jLabel9 = new javax.swing.JLabel(); - jLabel10 = new javax.swing.JLabel(); - jLabel11 = new javax.swing.JLabel(); + clientFrame = new javax.swing.JScrollPane(); + serverFrame = new javax.swing.JScrollPane(); + tunnelsExplanation = new javax.swing.JLabel(); + clientTunnelLabel = new javax.swing.JLabel(); + serverTunnelLabel = new javax.swing.JLabel(); networkPanel = new javax.swing.JPanel(); advancedPanel = new javax.swing.JPanel(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); - org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(desktopgui.Main.class).getContext().getResourceMap(GeneralConfiguration.class); + org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(net.i2p.desktopgui.desktopgui.Main.class).getContext().getResourceMap(GeneralConfiguration.class); setTitle(resourceMap.getString("Form.title")); // NOI18N setName("Form"); // NOI18N @@ -208,29 +208,29 @@ public class GeneralConfiguration extends javax.swing.JFrame { updatesPanel.setName("updatesPanel"); // NOI18N - jLabel8.setText(resourceMap.getString("jLabel8.text")); // NOI18N - jLabel8.setName("jLabel8"); // NOI18N + updateMethod.setText(resourceMap.getString("updateMethod.text")); // NOI18N + updateMethod.setName("updateMethod"); // NOI18N - buttonGroup1.add(jRadioButton1); - jRadioButton1.setText(resourceMap.getString("jRadioButton1.text")); // NOI18N - jRadioButton1.setName("jRadioButton1"); // NOI18N + buttonGroup1.add(updateInform); + updateInform.setText(resourceMap.getString("updateInform.text")); // NOI18N + updateInform.setName("updateInform"); // NOI18N - buttonGroup1.add(jRadioButton2); - jRadioButton2.setText(resourceMap.getString("jRadioButton2.text")); // NOI18N - jRadioButton2.setName("jRadioButton2"); // NOI18N + buttonGroup1.add(updateDownload); + updateDownload.setText(resourceMap.getString("updateDownload.text")); // NOI18N + updateDownload.setName("updateDownload"); // NOI18N - buttonGroup1.add(jRadioButton3); - jRadioButton3.setText(resourceMap.getString("jRadioButton3.text")); // NOI18N - jRadioButton3.setName("jRadioButton3"); // NOI18N + buttonGroup1.add(updateDownloadRestart); + updateDownloadRestart.setText(resourceMap.getString("updateDownloadRestart.text")); // NOI18N + updateDownloadRestart.setName("updateDownloadRestart"); // NOI18N - jToggleButton1.setText(resourceMap.getString("jToggleButton1.text")); // NOI18N - jToggleButton1.setName("jToggleButton1"); // NOI18N + checkUpdates.setText(resourceMap.getString("checkUpdates.text")); // NOI18N + checkUpdates.setName("checkUpdates"); // NOI18N - jToggleButton2.setText(resourceMap.getString("jToggleButton2.text")); // NOI18N - jToggleButton2.setName("jToggleButton2"); // NOI18N + updateNow.setText(resourceMap.getString("updateNow.text")); // NOI18N + updateNow.setName("updateNow"); // NOI18N - jToggleButton3.setText(resourceMap.getString("jToggleButton3.text")); // NOI18N - jToggleButton3.setName("jToggleButton3"); // NOI18N + advancedUpdateConfig.setText(resourceMap.getString("advancedUpdateConfig.text")); // NOI18N + advancedUpdateConfig.setName("advancedUpdateConfig"); // NOI18N javax.swing.GroupLayout updatesPanelLayout = new javax.swing.GroupLayout(updatesPanel); updatesPanel.setLayout(updatesPanelLayout); @@ -241,40 +241,40 @@ public class GeneralConfiguration extends javax.swing.JFrame { .addGroup(updatesPanelLayout.createSequentialGroup() .addGap(20, 20, 20) .addGroup(updatesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel8) + .addComponent(updateMethod) .addGroup(updatesPanelLayout.createSequentialGroup() - .addComponent(jToggleButton1) + .addComponent(checkUpdates) .addGap(18, 18, 18) - .addComponent(jToggleButton2)))) + .addComponent(updateNow)))) .addGroup(updatesPanelLayout.createSequentialGroup() .addGap(40, 40, 40) .addGroup(updatesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jRadioButton2) - .addComponent(jRadioButton1) - .addComponent(jRadioButton3)))) + .addComponent(updateDownload) + .addComponent(updateInform) + .addComponent(updateDownloadRestart)))) .addGap(9, 9, 9)) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, updatesPanelLayout.createSequentialGroup() .addContainerGap(339, Short.MAX_VALUE) - .addComponent(jToggleButton3) + .addComponent(advancedUpdateConfig) .addContainerGap()) ); updatesPanelLayout.setVerticalGroup( updatesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(updatesPanelLayout.createSequentialGroup() .addContainerGap() - .addComponent(jLabel8) + .addComponent(updateMethod) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jRadioButton1) + .addComponent(updateInform) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jRadioButton2) + .addComponent(updateDownload) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jRadioButton3) + .addComponent(updateDownloadRestart) .addGap(18, 18, 18) .addGroup(updatesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jToggleButton1) - .addComponent(jToggleButton2)) + .addComponent(checkUpdates) + .addComponent(updateNow)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 181, Short.MAX_VALUE) - .addComponent(jToggleButton3) + .addComponent(advancedUpdateConfig) .addContainerGap()) ); @@ -282,18 +282,18 @@ public class GeneralConfiguration extends javax.swing.JFrame { tunnelPanel.setName("tunnelPanel"); // NOI18N - jScrollPane1.setName("jScrollPane1"); // NOI18N + clientFrame.setName("clientFrame"); // NOI18N - jScrollPane2.setName("jScrollPane2"); // NOI18N + serverFrame.setName("serverFrame"); // NOI18N - jLabel9.setText(resourceMap.getString("jLabel9.text")); // NOI18N - jLabel9.setName("jLabel9"); // NOI18N + tunnelsExplanation.setText(resourceMap.getString("tunnelsExplanation.text")); // NOI18N + tunnelsExplanation.setName("tunnelsExplanation"); // NOI18N - jLabel10.setText(resourceMap.getString("jLabel10.text")); // NOI18N - jLabel10.setName("jLabel10"); // NOI18N + clientTunnelLabel.setText(resourceMap.getString("clientTunnelLabel.text")); // NOI18N + clientTunnelLabel.setName("clientTunnelLabel"); // NOI18N - jLabel11.setText(resourceMap.getString("jLabel11.text")); // NOI18N - jLabel11.setName("jLabel11"); // NOI18N + serverTunnelLabel.setText(resourceMap.getString("serverTunnelLabel.text")); // NOI18N + serverTunnelLabel.setName("serverTunnelLabel"); // NOI18N javax.swing.GroupLayout tunnelPanelLayout = new javax.swing.GroupLayout(tunnelPanel); tunnelPanel.setLayout(tunnelPanelLayout); @@ -302,26 +302,26 @@ public class GeneralConfiguration extends javax.swing.JFrame { .addGroup(tunnelPanelLayout.createSequentialGroup() .addContainerGap() .addGroup(tunnelPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE) - .addComponent(jLabel9, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE) - .addComponent(jLabel10) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE) - .addComponent(jLabel11)) + .addComponent(serverFrame, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE) + .addComponent(tunnelsExplanation, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE) + .addComponent(clientTunnelLabel) + .addComponent(clientFrame, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE) + .addComponent(serverTunnelLabel)) .addContainerGap()) ); tunnelPanelLayout.setVerticalGroup( tunnelPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(tunnelPanelLayout.createSequentialGroup() .addContainerGap() - .addComponent(jLabel10) + .addComponent(clientTunnelLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE) + .addComponent(clientFrame, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel11) + .addComponent(serverTunnelLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE) + .addComponent(serverFrame, javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel9, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(tunnelsExplanation, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap()) ); @@ -420,35 +420,35 @@ private void downloadgbKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_ // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JPanel advancedPanel; + private javax.swing.JToggleButton advancedUpdateConfig; private javax.swing.JPanel applyPanel; private javax.swing.ButtonGroup buttonGroup1; private javax.swing.JToggleButton cancel; + private javax.swing.JToggleButton checkUpdates; + private javax.swing.JScrollPane clientFrame; + private javax.swing.JLabel clientTunnelLabel; private javax.swing.JLabel downloadSpeedLabel; private javax.swing.JTextField downloadgb; private javax.swing.JComboBox downloadkbps; private javax.swing.JTextField downloadspeed; - private javax.swing.JLabel jLabel10; - private javax.swing.JLabel jLabel11; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; private javax.swing.JLabel jLabel6; private javax.swing.JLabel jLabel7; - private javax.swing.JLabel jLabel8; - private javax.swing.JLabel jLabel9; - private javax.swing.JRadioButton jRadioButton1; - private javax.swing.JRadioButton jRadioButton2; - private javax.swing.JRadioButton jRadioButton3; - private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JScrollPane jScrollPane2; - private javax.swing.JToggleButton jToggleButton1; - private javax.swing.JToggleButton jToggleButton2; - private javax.swing.JToggleButton jToggleButton3; private javax.swing.JPanel networkPanel; private javax.swing.JToggleButton ok; + private javax.swing.JScrollPane serverFrame; + private javax.swing.JLabel serverTunnelLabel; private javax.swing.JTabbedPane settingsPanel; private javax.swing.JPanel speedPanel; private javax.swing.JPanel tunnelPanel; + private javax.swing.JLabel tunnelsExplanation; + private javax.swing.JRadioButton updateDownload; + private javax.swing.JRadioButton updateDownloadRestart; + private javax.swing.JRadioButton updateInform; + private javax.swing.JLabel updateMethod; + private javax.swing.JToggleButton updateNow; private javax.swing.JPanel updatesPanel; private javax.swing.JLabel uploadSpeedLabel; private javax.swing.JTextField uploadgb; diff --git a/apps/desktopgui/src/gui/JPopupTrayIcon.java b/apps/desktopgui/src/net/i2p/desktopgui/gui/JPopupTrayIcon.java similarity index 99% rename from apps/desktopgui/src/gui/JPopupTrayIcon.java rename to apps/desktopgui/src/net/i2p/desktopgui/gui/JPopupTrayIcon.java index 1b0ae1f86..1f62df2c2 100644 --- a/apps/desktopgui/src/gui/JPopupTrayIcon.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/JPopupTrayIcon.java @@ -24,7 +24,7 @@ * */ -package gui; +package net.i2p.desktopgui.gui; import java.awt.Dimension; import java.awt.Frame; diff --git a/apps/desktopgui/src/gui/LogViewer.form b/apps/desktopgui/src/net/i2p/desktopgui/gui/LogViewer.form similarity index 98% rename from apps/desktopgui/src/gui/LogViewer.form rename to apps/desktopgui/src/net/i2p/desktopgui/gui/LogViewer.form index ce0120068..ed2441319 100644 --- a/apps/desktopgui/src/gui/LogViewer.form +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/LogViewer.form @@ -12,6 +12,7 @@ + diff --git a/apps/desktopgui/src/gui/LogViewer.java b/apps/desktopgui/src/net/i2p/desktopgui/gui/LogViewer.java similarity index 97% rename from apps/desktopgui/src/gui/LogViewer.java rename to apps/desktopgui/src/net/i2p/desktopgui/gui/LogViewer.java index e08a38f7e..1edf85b3b 100644 --- a/apps/desktopgui/src/gui/LogViewer.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/LogViewer.java @@ -4,7 +4,7 @@ * Created on 10 april 2009, 19:17 */ -package gui; +package net.i2p.desktopgui.gui; import java.io.BufferedReader; import java.io.File; @@ -73,7 +73,7 @@ public class LogViewer extends javax.swing.JFrame { clearButton = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); - org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(desktopgui.Main.class).getContext().getResourceMap(LogViewer.class); + org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(net.i2p.desktopgui.desktopgui.Main.class).getContext().getResourceMap(LogViewer.class); setTitle(resourceMap.getString("Form.title")); // NOI18N setName("Form"); // NOI18N diff --git a/apps/desktopgui/src/gui/SpeedSelector.form b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector.form similarity index 99% rename from apps/desktopgui/src/gui/SpeedSelector.form rename to apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector.form index 79d25ae96..5ee7b94ac 100644 --- a/apps/desktopgui/src/gui/SpeedSelector.form +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector.form @@ -16,6 +16,7 @@ + diff --git a/apps/desktopgui/src/gui/SpeedSelector.java b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector.java similarity index 96% rename from apps/desktopgui/src/gui/SpeedSelector.java rename to apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector.java index bce18621f..335812e2a 100644 --- a/apps/desktopgui/src/gui/SpeedSelector.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector.java @@ -4,15 +4,14 @@ * Created on 3 april 2009, 13:57 */ -package gui; +package net.i2p.desktopgui.gui; -import java.awt.Dimension; import java.awt.Point; import java.util.Properties; import javax.swing.JComboBox; import javax.swing.JTextField; -import persistence.PropertyManager; -import util.IntegerVerifier; +import net.i2p.desktopgui.persistence.PropertyManager; +import net.i2p.desktopgui.util.IntegerVerifier; /** * @@ -60,7 +59,7 @@ public class SpeedSelector extends javax.swing.JFrame { downloadkbps = new javax.swing.JComboBox(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(desktopgui.Main.class).getContext().getResourceMap(SpeedSelector.class); + org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(net.i2p.desktopgui.desktopgui.Main.class).getContext().getResourceMap(SpeedSelector.class); setTitle(resourceMap.getString("Form.title")); // NOI18N setMinimumSize(new java.awt.Dimension(610, 330)); setName("Form"); // NOI18N diff --git a/apps/desktopgui/src/gui/SpeedSelector2.form b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector2.form similarity index 98% rename from apps/desktopgui/src/gui/SpeedSelector2.form rename to apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector2.form index 5c305de19..54f5fa726 100644 --- a/apps/desktopgui/src/gui/SpeedSelector2.form +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector2.form @@ -20,6 +20,7 @@ + diff --git a/apps/desktopgui/src/gui/SpeedSelector2.java b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector2.java similarity index 96% rename from apps/desktopgui/src/gui/SpeedSelector2.java rename to apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector2.java index 1177b5725..772d16918 100644 --- a/apps/desktopgui/src/gui/SpeedSelector2.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector2.java @@ -4,14 +4,13 @@ * Created on 3 april 2009, 14:36 */ -package gui; +package net.i2p.desktopgui.gui; -import java.awt.Dimension; import java.awt.Point; import java.util.Enumeration; import java.util.Properties; import javax.swing.AbstractButton; -import persistence.PropertyManager; +import net.i2p.desktopgui.persistence.PropertyManager; /** * @@ -48,7 +47,7 @@ public class SpeedSelector2 extends javax.swing.JFrame { jLabel1 = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(desktopgui.Main.class).getContext().getResourceMap(SpeedSelector2.class); + org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(net.i2p.desktopgui.desktopgui.Main.class).getContext().getResourceMap(SpeedSelector2.class); setTitle(resourceMap.getString("Form.title")); // NOI18N setMinimumSize(new java.awt.Dimension(610, 330)); setName("Form"); // NOI18N diff --git a/apps/desktopgui/src/gui/SpeedSelector3.form b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector3.form similarity index 100% rename from apps/desktopgui/src/gui/SpeedSelector3.form rename to apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector3.form diff --git a/apps/desktopgui/src/gui/SpeedSelector3.java b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector3.java similarity index 98% rename from apps/desktopgui/src/gui/SpeedSelector3.java rename to apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector3.java index bd26a9a75..933ad3ff2 100644 --- a/apps/desktopgui/src/gui/SpeedSelector3.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelector3.java @@ -4,16 +4,16 @@ * Created on 3 april 2009, 15:17 */ -package gui; +package net.i2p.desktopgui.gui; import java.awt.Dimension; import java.awt.Point; import java.util.Properties; import javax.swing.JComboBox; import javax.swing.JTextField; -import persistence.PropertyManager; -import router.configuration.SpeedHandler; -import router.configuration.SpeedHelper; +import net.i2p.desktopgui.persistence.PropertyManager; +import net.i2p.desktopgui.router.configuration.SpeedHandler; +import net.i2p.desktopgui.router.configuration.SpeedHelper; /** * @@ -67,7 +67,7 @@ public class SpeedSelector3 extends javax.swing.JFrame { explanation = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(desktopgui.Main.class).getContext().getResourceMap(SpeedSelector3.class); + org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(net.i2p.desktopgui.desktopgui.Main.class).getContext().getResourceMap(SpeedSelector3.class); setTitle(resourceMap.getString("Form.title")); // NOI18N setMinimumSize(new java.awt.Dimension(670, 330)); setName("Form"); // NOI18N diff --git a/apps/desktopgui/src/gui/SpeedSelectorConstants.java b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelectorConstants.java similarity index 96% rename from apps/desktopgui/src/gui/SpeedSelectorConstants.java rename to apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelectorConstants.java index ea5e32427..1088f6957 100644 --- a/apps/desktopgui/src/gui/SpeedSelectorConstants.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/SpeedSelectorConstants.java @@ -1,4 +1,4 @@ -package gui; +package net.i2p.desktopgui.gui; /** * diff --git a/apps/desktopgui/src/gui/Tray.java b/apps/desktopgui/src/net/i2p/desktopgui/gui/Tray.java similarity index 97% rename from apps/desktopgui/src/gui/Tray.java rename to apps/desktopgui/src/net/i2p/desktopgui/gui/Tray.java index 7c95cd6eb..b20a850f6 100644 --- a/apps/desktopgui/src/gui/Tray.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/Tray.java @@ -3,9 +3,9 @@ * and open the template in the editor. */ -package gui; +package net.i2p.desktopgui.gui; -import desktopgui.*; +import net.i2p.desktopgui.desktopgui.*; import java.awt.AWTException; import java.awt.Desktop; import java.awt.Image; @@ -23,9 +23,9 @@ import java.util.logging.Logger; import javax.swing.JMenu; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; -import router.RouterHandler; -import router.RouterHelper; -import router.configuration.PeerHelper; +import net.i2p.desktopgui.router.RouterHandler; +import net.i2p.desktopgui.router.RouterHelper; +import net.i2p.desktopgui.router.configuration.PeerHelper; /** * diff --git a/apps/desktopgui/src/gui/Version.form b/apps/desktopgui/src/net/i2p/desktopgui/gui/Version.form similarity index 98% rename from apps/desktopgui/src/gui/Version.form rename to apps/desktopgui/src/net/i2p/desktopgui/gui/Version.form index 27d9161dc..32ab90b31 100644 --- a/apps/desktopgui/src/gui/Version.form +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/Version.form @@ -12,6 +12,7 @@ + diff --git a/apps/desktopgui/src/gui/Version.java b/apps/desktopgui/src/net/i2p/desktopgui/gui/Version.java similarity index 94% rename from apps/desktopgui/src/gui/Version.java rename to apps/desktopgui/src/net/i2p/desktopgui/gui/Version.java index b7e275df1..25a38d6b8 100644 --- a/apps/desktopgui/src/gui/Version.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/Version.java @@ -4,10 +4,10 @@ * Created on 13 april 2009, 13:48 */ -package gui; +package net.i2p.desktopgui.gui; import javax.swing.JFrame; -import router.RouterHelper; +import net.i2p.desktopgui.router.RouterHelper; /** * @@ -24,7 +24,7 @@ public class Version extends javax.swing.JDialog { super(parent, modal); initComponents(); String i2pVersion = RouterHelper.getVersion(); - String guiVersion = desktopgui.GUIVersion.VERSION; + String guiVersion = net.i2p.desktopgui.desktopgui.GUIVersion.VERSION; this.I2PVersion.setText("

" + i2pVersion + "

"); this.GUIVersion.setText("

" + guiVersion + "

"); this.setVisible(true); @@ -46,7 +46,7 @@ public class Version extends javax.swing.JDialog { GUIVersion = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(desktopgui.Main.class).getContext().getResourceMap(Version.class); + org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(net.i2p.desktopgui.desktopgui.Main.class).getContext().getResourceMap(Version.class); setTitle(resourceMap.getString("Form.title")); // NOI18N setName("Form"); // NOI18N diff --git a/apps/desktopgui/src/gui/resources/GeneralConfiguration.properties b/apps/desktopgui/src/net/i2p/desktopgui/gui/resources/GeneralConfiguration.properties similarity index 54% rename from apps/desktopgui/src/gui/resources/GeneralConfiguration.properties rename to apps/desktopgui/src/net/i2p/desktopgui/gui/resources/GeneralConfiguration.properties index 6387ce274..e1c16a08c 100644 --- a/apps/desktopgui/src/gui/resources/GeneralConfiguration.properties +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/resources/GeneralConfiguration.properties @@ -5,16 +5,6 @@ jLabel4.text=Monthly usage: jLabel5.text=GB jLabel6.text=GB jLabel7.text=Explanation ... -jLabel8.text=What is your preferred automatic update setting? -jRadioButton1.text=Only inform about updates -jRadioButton2.text=Download and verify update file, do not restart -jRadioButton3.text=Download, verify and restart -jToggleButton1.text=Check for updates now -jToggleButton2.text=Update available: update now -jToggleButton3.text=Advanced update configuration -jLabel9.text=Tunnel explanation -jLabel10.text=Client tunnels: -jLabel11.text=Server tunnels: Form.title=General Configuration speedPanel.TabConstraints.tabTitle=Speed updatesPanel.TabConstraints.tabTitle=Updates @@ -27,3 +17,13 @@ uploadspeed.text=jTextField1 downloadspeed.text=jTextField2 uploadgb.text=jTextField3 downloadgb.text=jTextField4 +updateMethod.text=What is your preferred automatic update setting? +updateInform.text=Only inform about updates +updateDownload.text=Download and verify update file, do not restart +updateDownloadRestart.text=Download, verify and restart +checkUpdates.text=Check for updates now +updateNow.text=Update available: update now +advancedUpdateConfig.text=Advanced update configuration +clientTunnelLabel.text=Client tunnels: +serverTunnelLabel.text=Server tunnels: +tunnelsExplanation.text=Tunnel explanation diff --git a/apps/desktopgui/src/gui/resources/LogViewer.properties b/apps/desktopgui/src/net/i2p/desktopgui/gui/resources/LogViewer.properties similarity index 100% rename from apps/desktopgui/src/gui/resources/LogViewer.properties rename to apps/desktopgui/src/net/i2p/desktopgui/gui/resources/LogViewer.properties diff --git a/apps/desktopgui/src/gui/resources/SpeedSelector.properties b/apps/desktopgui/src/net/i2p/desktopgui/gui/resources/SpeedSelector.properties similarity index 100% rename from apps/desktopgui/src/gui/resources/SpeedSelector.properties rename to apps/desktopgui/src/net/i2p/desktopgui/gui/resources/SpeedSelector.properties diff --git a/apps/desktopgui/src/gui/resources/SpeedSelector2.properties b/apps/desktopgui/src/net/i2p/desktopgui/gui/resources/SpeedSelector2.properties similarity index 100% rename from apps/desktopgui/src/gui/resources/SpeedSelector2.properties rename to apps/desktopgui/src/net/i2p/desktopgui/gui/resources/SpeedSelector2.properties diff --git a/apps/desktopgui/src/gui/resources/SpeedSelector3.properties b/apps/desktopgui/src/net/i2p/desktopgui/gui/resources/SpeedSelector3.properties similarity index 100% rename from apps/desktopgui/src/gui/resources/SpeedSelector3.properties rename to apps/desktopgui/src/net/i2p/desktopgui/gui/resources/SpeedSelector3.properties diff --git a/apps/desktopgui/src/gui/resources/Version.properties b/apps/desktopgui/src/net/i2p/desktopgui/gui/resources/Version.properties similarity index 100% rename from apps/desktopgui/src/gui/resources/Version.properties rename to apps/desktopgui/src/net/i2p/desktopgui/gui/resources/Version.properties diff --git a/apps/desktopgui/src/persistence/PropertyManager.java b/apps/desktopgui/src/net/i2p/desktopgui/persistence/PropertyManager.java similarity index 98% rename from apps/desktopgui/src/persistence/PropertyManager.java rename to apps/desktopgui/src/net/i2p/desktopgui/persistence/PropertyManager.java index bacbf348a..770bd0957 100644 --- a/apps/desktopgui/src/persistence/PropertyManager.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/persistence/PropertyManager.java @@ -1,4 +1,4 @@ -package persistence; +package net.i2p.desktopgui.persistence; import java.io.File; import java.io.FileInputStream; diff --git a/apps/desktopgui/src/router/RouterHandler.java b/apps/desktopgui/src/net/i2p/desktopgui/router/RouterHandler.java similarity index 97% rename from apps/desktopgui/src/router/RouterHandler.java rename to apps/desktopgui/src/net/i2p/desktopgui/router/RouterHandler.java index 0752f877b..022c5c814 100644 --- a/apps/desktopgui/src/router/RouterHandler.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/router/RouterHandler.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package router; +package net.i2p.desktopgui.router; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/apps/desktopgui/src/router/RouterHelper.java b/apps/desktopgui/src/net/i2p/desktopgui/router/RouterHelper.java similarity index 93% rename from apps/desktopgui/src/router/RouterHelper.java rename to apps/desktopgui/src/net/i2p/desktopgui/router/RouterHelper.java index 49a7c8b29..2da95f0c6 100644 --- a/apps/desktopgui/src/router/RouterHelper.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/router/RouterHelper.java @@ -1,4 +1,4 @@ -package router; +package net.i2p.desktopgui.router; import net.i2p.router.RouterContext; import net.i2p.router.RouterVersion; diff --git a/apps/desktopgui/src/router/configuration/PeerHelper.java b/apps/desktopgui/src/net/i2p/desktopgui/router/configuration/PeerHelper.java similarity index 98% rename from apps/desktopgui/src/router/configuration/PeerHelper.java rename to apps/desktopgui/src/net/i2p/desktopgui/router/configuration/PeerHelper.java index 76ffeef87..74df2b3d9 100644 --- a/apps/desktopgui/src/router/configuration/PeerHelper.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/router/configuration/PeerHelper.java @@ -1,4 +1,4 @@ -package router.configuration; +package net.i2p.desktopgui.router.configuration; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -11,7 +11,7 @@ import net.i2p.router.CommSystemFacade; import net.i2p.router.RouterContext; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.router.transport.ntcp.NTCPAddress; -import router.RouterHelper; +import net.i2p.desktopgui.router.RouterHelper; /** * Part of the code imported and adapted from the I2P Router Console (which is licensed as public domain) diff --git a/apps/desktopgui/src/router/configuration/SpeedHandler.java b/apps/desktopgui/src/net/i2p/desktopgui/router/configuration/SpeedHandler.java similarity index 91% rename from apps/desktopgui/src/router/configuration/SpeedHandler.java rename to apps/desktopgui/src/net/i2p/desktopgui/router/configuration/SpeedHandler.java index 235790792..8fd675657 100644 --- a/apps/desktopgui/src/router/configuration/SpeedHandler.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/router/configuration/SpeedHandler.java @@ -1,8 +1,8 @@ -package router.configuration; +package net.i2p.desktopgui.router.configuration; import net.i2p.router.RouterContext; import net.i2p.router.transport.FIFOBandwidthRefiller; -import router.RouterHelper; +import net.i2p.desktopgui.router.RouterHelper; /** * diff --git a/apps/desktopgui/src/router/configuration/SpeedHelper.java b/apps/desktopgui/src/net/i2p/desktopgui/router/configuration/SpeedHelper.java similarity index 93% rename from apps/desktopgui/src/router/configuration/SpeedHelper.java rename to apps/desktopgui/src/net/i2p/desktopgui/router/configuration/SpeedHelper.java index bba361cf6..5d2074de2 100644 --- a/apps/desktopgui/src/router/configuration/SpeedHelper.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/router/configuration/SpeedHelper.java @@ -1,7 +1,7 @@ -package router.configuration; +package net.i2p.desktopgui.router.configuration; import net.i2p.router.transport.FIFOBandwidthRefiller; -import router.RouterHelper; +import net.i2p.desktopgui.router.RouterHelper; /** * diff --git a/apps/desktopgui/src/util/IntegerVerifier.java b/apps/desktopgui/src/net/i2p/desktopgui/util/IntegerVerifier.java similarity index 95% rename from apps/desktopgui/src/util/IntegerVerifier.java rename to apps/desktopgui/src/net/i2p/desktopgui/util/IntegerVerifier.java index 74f87961d..7cc0fb46a 100644 --- a/apps/desktopgui/src/util/IntegerVerifier.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/util/IntegerVerifier.java @@ -1,4 +1,4 @@ -package util; +package net.i2p.desktopgui.util; import javax.swing.InputVerifier; import javax.swing.JComponent; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java index 015f5c9c5..8e7627309 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java @@ -92,7 +92,7 @@ public class I2PTunnel implements Logging, EventDispatcher { private final List tasks = new ArrayList(); private int next_task_id = 1; - private Set listeners = new HashSet(); + private final Set listeners = new HashSet(); public static void main(String[] args) throws IOException { new I2PTunnel(args); @@ -668,9 +668,9 @@ public class I2PTunnel implements Logging, EventDispatcher { */ public void runConnectClient(String args[], Logging l) { if (args.length >= 1 && args.length <= 3) { - int port = -1; + int _port = -1; try { - port = Integer.parseInt(args[0]); + _port = Integer.parseInt(args[0]); } catch (NumberFormatException nfe) { _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe); return; @@ -702,10 +702,10 @@ public class I2PTunnel implements Logging, EventDispatcher { I2PTunnelTask task; ownDest = !isShared; try { - task = new I2PTunnelConnectClient(port, l, ownDest, proxy, (EventDispatcher) this, this); + task = new I2PTunnelConnectClient(_port, l, ownDest, proxy, (EventDispatcher) this, this); addtask(task); } catch (IllegalArgumentException iae) { - _log.error(getPrefix() + "Invalid I2PTunnel config to create an httpclient [" + host + ":"+ port + "]", iae); + _log.error(getPrefix() + "Invalid I2PTunnel config to create an httpclient [" + host + ":"+ _port + "]", iae); } } else { l.log("connectclient [] []"); @@ -728,9 +728,9 @@ public class I2PTunnel implements Logging, EventDispatcher { */ public void runIrcClient(String args[], Logging l) { if (args.length >= 2) { - int port = -1; + int _port = -1; try { - port = Integer.parseInt(args[0]); + _port = Integer.parseInt(args[0]); } catch (NumberFormatException nfe) { l.log("invalid port"); _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe); @@ -757,12 +757,12 @@ public class I2PTunnel implements Logging, EventDispatcher { String privateKeyFile = null; if (args.length >= 4) privateKeyFile = args[3]; - task = new I2PTunnelIRCClient(port, args[1], l, ownDest, (EventDispatcher) this, this, privateKeyFile); + task = new I2PTunnelIRCClient(_port, args[1], l, ownDest, (EventDispatcher) this, this, privateKeyFile); addtask(task); notifyEvent("ircclientTaskId", Integer.valueOf(task.getId())); } catch (IllegalArgumentException iae) { - _log.error(getPrefix() + "Invalid I2PTunnel config to create an ircclient [" + host + ":"+ port + "]", iae); - l.log("Invalid I2PTunnel configuration [" + host + ":" + port + "]"); + _log.error(getPrefix() + "Invalid I2PTunnel config to create an ircclient [" + host + ":"+ _port + "]", iae); + l.log("Invalid I2PTunnel configuration [" + host + ":" + _port + "]"); notifyEvent("ircclientTaskId", Integer.valueOf(-1)); } } else { @@ -786,9 +786,9 @@ public class I2PTunnel implements Logging, EventDispatcher { */ public void runSOCKSTunnel(String args[], Logging l) { if (args.length >= 1 && args.length <= 2) { - int port = -1; + int _port = -1; try { - port = Integer.parseInt(args[0]); + _port = Integer.parseInt(args[0]); } catch (NumberFormatException nfe) { l.log("invalid port"); _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe); @@ -802,7 +802,7 @@ public class I2PTunnel implements Logging, EventDispatcher { ownDest = !isShared; I2PTunnelTask task; - task = new I2PSOCKSTunnel(port, l, ownDest, (EventDispatcher) this, this); + task = new I2PSOCKSTunnel(_port, l, ownDest, (EventDispatcher) this, this); addtask(task); notifyEvent("sockstunnelTaskId", Integer.valueOf(task.getId())); } else { @@ -820,9 +820,9 @@ public class I2PTunnel implements Logging, EventDispatcher { */ public void runStreamrClient(String args[], Logging l) { if (args.length == 3) { - InetAddress host; + InetAddress _host; try { - host = InetAddress.getByName(args[0]); + _host = InetAddress.getByName(args[0]); } catch (UnknownHostException uhe) { l.log("unknown host"); _log.error(getPrefix() + "Error resolving " + args[0], uhe); @@ -830,9 +830,9 @@ public class I2PTunnel implements Logging, EventDispatcher { return; } - int port = -1; + int _port = -1; try { - port = Integer.parseInt(args[1]); + _port = Integer.parseInt(args[1]); } catch (NumberFormatException nfe) { l.log("invalid port"); _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe); @@ -840,7 +840,7 @@ public class I2PTunnel implements Logging, EventDispatcher { return; } - StreamrConsumer task = new StreamrConsumer(host, port, args[2], l, (EventDispatcher) this, this); + StreamrConsumer task = new StreamrConsumer(_host, _port, args[2], l, (EventDispatcher) this, this); task.startRunning(); addtask(task); notifyEvent("streamrtunnelTaskId", Integer.valueOf(task.getId())); @@ -859,9 +859,9 @@ public class I2PTunnel implements Logging, EventDispatcher { */ public void runStreamrServer(String args[], Logging l) { if (args.length == 2) { - int port = -1; + int _port = -1; try { - port = Integer.parseInt(args[0]); + _port = Integer.parseInt(args[0]); } catch (NumberFormatException nfe) { l.log("invalid port"); _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe); @@ -877,7 +877,7 @@ public class I2PTunnel implements Logging, EventDispatcher { return; } - StreamrProducer task = new StreamrProducer(port, privKeyFile, args[1], l, (EventDispatcher) this, this); + StreamrProducer task = new StreamrProducer(_port, privKeyFile, args[1], l, (EventDispatcher) this, this); task.startRunning(); addtask(task); notifyEvent("streamrtunnelTaskId", Integer.valueOf(task.getId())); diff --git a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java index aeef4e38e..ec08a8fd3 100644 --- a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java @@ -200,9 +200,9 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 implements I2PSession { protected class MuxedAvailabilityNotifier extends AvailabilityNotifier { private LinkedBlockingQueue _msgs; - private AtomicBoolean _alive = new AtomicBoolean(false); + private volatile Boolean _alive = new Boolean(false); private static final int POISON_SIZE = -99999; - private AtomicBoolean stopping = new AtomicBoolean(false); + private final AtomicBoolean stopping = new AtomicBoolean(false); public MuxedAvailabilityNotifier() { _msgs = new LinkedBlockingQueue(); @@ -210,28 +210,29 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 implements I2PSession { @Override public void stopNotifying() { - if(stopping.get()) return; - stopping.set(true); boolean again = true; - // _msgs.clear(); - // Thread.yield(); - if (_alive.get()) { - // System.out.println("I2PSessionMuxedImpl.stopNotifying()"); - _msgs.clear(); - while(again) { - try { - _msgs.put(new MsgData(0, POISON_SIZE, 0, 0, 0)); - again = false; - // System.out.println("I2PSessionMuxedImpl.stopNotifying() success."); - } catch (InterruptedException ie) { - continue; + synchronized (stopping) { + if(!stopping.get()) { + stopping.set(true); + if (_alive.equals(true)) { + // System.out.println("I2PSessionMuxedImpl.stopNotifying()"); + _msgs.clear(); + while(again) { + try { + _msgs.put(new MsgData(0, POISON_SIZE, 0, 0, 0)); + again = false; + // System.out.println("I2PSessionMuxedImpl.stopNotifying() success."); + } catch (InterruptedException ie) { + continue; + } + } } + _alive = false; + stopping.set(false); } + stopping.notifyAll(); } - _alive.set(false); - stopping.set(false); // Do we need this? } - /** unused */ @Override public void available(long msgId, int size) { throw new IllegalArgumentException("no"); } @@ -245,8 +246,8 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 implements I2PSession { @Override public void run() { MsgData msg; - _alive.set(true); - while (_alive.get()) { + _alive=true; + while (_alive) { try { msg = _msgs.take(); } catch (InterruptedException ie) { diff --git a/history.txt b/history.txt index 4acb3ed84..962ff73c1 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,14 @@ +2009-05-09 sponge + * merge + +2009-05-09 sponge + * fixed OOM on lock (woops! my bad!) + +2009-05-08 Mathiasdm + * desktopgui: moved files to stop polluting the namespace + (everything now in net.i2p.desktopgui) + * desktopgui: some variable renaming in general configuration + 2009-05-07 mkvore * SAM: version 3 added * SAM: blocking case corrected on simultaneous client connection (v.1-3) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a86ea74e3..c0f2d3825 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 10; + public final static long BUILD = 12; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;