[freenet-cvs] r18195 - in trunk/apps/thingamablog/src/net/sf/thingamablog: gui/properties transport xml

[die...@freenetproject.org]

Author: dieppe
Date: 2008-02-28 13:16:47 +0000 (Thu, 28 Feb 2008)
New Revision: 18195

Modified:
   
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/properties/TBFlogNodeWizardDialog.java
   
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/properties/TBPublishTransportPanel.java
   trunk/apps/thingamablog/src/net/sf/thingamablog/transport/FCPTransport.java
   trunk/apps/thingamablog/src/net/sf/thingamablog/xml/TBPersistFactory.java
Log:
Bug fix : the node configuration was put back to the global configuration 
during the flog wizard (and each time we called TBPublishTransport)


Modified: 
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/properties/TBFlogNodeWizardDialog.java
===================================================================
--- 
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/properties/TBFlogNodeWizardDialog.java
  2008-02-27 21:43:56 UTC (rev 18194)
+++ 
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/properties/TBFlogNodeWizardDialog.java
  2008-02-28 13:16:47 UTC (rev 18195)
@@ -220,6 +220,7 @@

                 flog.setPublishTransport(new 
net.sf.thingamablog.transport.FCPTransport());
                 ((FCPTransport) 
flog.getPublishTransport()).setInsertURI(keys[0]);
+                ((FCPTransport) flog.getPublishTransport()).setNode(hostname, 
port);
                 logger.log(Level.INFO,"Transport method set to FCP");
             } catch (IOException ex) {
                 logger.log(Level.INFO,"Node unreachable : " + ex.getMessage());

Modified: 
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/properties/TBPublishTransportPanel.java
===================================================================
--- 
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/properties/TBPublishTransportPanel.java
 2008-02-27 21:43:56 UTC (rev 18194)
+++ 
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/properties/TBPublishTransportPanel.java
 2008-02-28 13:16:47 UTC (rev 18195)
@@ -185,8 +185,8 @@
                        tLayout.show(transportsPanel, LOCAL);
                } else {
                         FCPTransport t =(FCPTransport)wb.getPublishTransport();
-                        
fcpPanel.setMachineNameField(TBGlobals.getProperty("NODE_HOSTNAME"));
-                        
fcpPanel.setPortField(Integer.parseInt(TBGlobals.getProperty("NODE_PORT")));
+                        fcpPanel.setMachineNameField(t.getHostname());
+                        fcpPanel.setPortField(t.getPort());
                         fcpPanel.setInsertUri("USK@" + t.getInsertURI() + "/");
                         transportTypeCombo.setSelectedItem(FCP);
                         tLayout.show(transportsPanel, FCP);

Modified: 
trunk/apps/thingamablog/src/net/sf/thingamablog/transport/FCPTransport.java
===================================================================
--- trunk/apps/thingamablog/src/net/sf/thingamablog/transport/FCPTransport.java 
2008-02-27 21:43:56 UTC (rev 18194)
+++ trunk/apps/thingamablog/src/net/sf/thingamablog/transport/FCPTransport.java 
2008-02-28 13:16:47 UTC (rev 18195)
@@ -32,7 +32,6 @@
 import net.sf.thingamablog.util.freenet.fcp.Verbosity;
 import net.sf.thingamablog.util.freenet.fcp.fcpManager;
 import net.sf.thingamablog.util.string.ASCIIconv;
-import src.net.sf.thingamablog.util.io.ReplacingOutputStream;

 /**
  * There is *a lot* of code below that comes from jSite
@@ -46,6 +45,8 @@
     private String failMsg;
     private boolean hasPublish = false;
     private int edition;
+    private String hostname;
+    private int port;

     /**
      * Connects the transport
@@ -123,6 +124,7 @@
         System.out.println("Default name : " + frontPage);
         putDir.setDefaultName(frontPage);
         putDir.setMaxRetries(-1);
+        putDir.setVerbosity(Verbosity.ALL);
         int totalBytes = 0;
         for(Enumeration e = ht.keys() ; e.hasMoreElements() ;) {
             Object element = e.nextElement();
@@ -182,15 +184,17 @@
     }

     public void setNode(String hostname, int port) {
+        this.hostname = hostname;
+        this.port = port;
         Manager.setNode(hostname,port);
     }

-    public String getPort(){
-        return Manager.getNode().getPort() + "";
+    public int getPort(){
+        return this.port;
     }

     public String getHostname(){
-        return Manager.getNode().getHostname();
+        return this.hostname;
     }

     public String getInsertURI(){

Modified: 
trunk/apps/thingamablog/src/net/sf/thingamablog/xml/TBPersistFactory.java
===================================================================
--- trunk/apps/thingamablog/src/net/sf/thingamablog/xml/TBPersistFactory.java   
2008-02-27 21:43:56 UTC (rev 18194)
+++ trunk/apps/thingamablog/src/net/sf/thingamablog/xml/TBPersistFactory.java   
2008-02-28 13:16:47 UTC (rev 18195)
@@ -478,7 +478,7 @@
                     FCPTransport fpt = (FCPTransport) pt;
                     transport.setAttribute("type","fcp");
                     transport.setAttribute("hostname",fpt.getHostname());
-                    transport.setAttribute("port",fpt.getPort());
+                    transport.setAttribute("port",fpt.getPort() + "");
                     transport.setAttribute("edition",fpt.getEdition()+"");
                     transport.setAttribute("insertURI",fpt.getInsertURI());
                 }