Author: dieppe
Date: 2008-04-14 02:41:21 +0000 (Mon, 14 Apr 2008)
New Revision: 19287
Modified:
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/app/ThingamablogFrame.java
trunk/apps/thingamablog/src/net/sf/thingamablog/util/freenet/fcp/ClientPutComplexDir.java
trunk/apps/thingamablog/src/net/sf/thingamablog/util/freenet/fcp/Connection.java
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/Closer.java
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/LineInputStream.java
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/ReplacingOutputStream.java
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/StreamCopier.java
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/TempFileInputStream.java
Log:
Don't show the "PublishAll" action if the blog is a flog (the publish
action is the same as PublishAll action for a flog).
+ some refactoring.
Modified:
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/app/ThingamablogFrame.java
===================================================================
---
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/app/ThingamablogFrame.java
2008-04-14 02:37:31 UTC (rev 19286)
+++
trunk/apps/thingamablog/src/net/sf/thingamablog/gui/app/ThingamablogFrame.java
2008-04-14 02:41:21 UTC (rev 19287)
@@ -2001,8 +2001,9 @@
htmlOptionsPane.addOption(new ReadEntriesLink());
htmlOptionsPane.addOption(new ConfigureWeblogLink());
htmlOptionsPane.addHeading(i18n.str("publishing"));
//$NON-NLS-1$
- htmlOptionsPane.addOption(new PublishLink());
- htmlOptionsPane.addOption(new PublishAllLink());
+ htmlOptionsPane.addOption(new PublishLink());
+ if (obj instanceof TBWeblog && ((TBWeblog)
obj).getType().equals("internet"))
+ htmlOptionsPane.addOption(new PublishAllLink());
htmlOptionsPane.addOption(new PingLink());
}
else if(obj == WeblogTreeModel.ROOT)
Modified:
trunk/apps/thingamablog/src/net/sf/thingamablog/util/freenet/fcp/ClientPutComplexDir.java
===================================================================
---
trunk/apps/thingamablog/src/net/sf/thingamablog/util/freenet/fcp/ClientPutComplexDir.java
2008-04-14 02:37:31 UTC (rev 19286)
+++
trunk/apps/thingamablog/src/net/sf/thingamablog/util/freenet/fcp/ClientPutComplexDir.java
2008-04-14 02:41:21 UTC (rev 19287)
@@ -30,7 +30,7 @@
import java.util.Iterator;
import java.util.List;
-import src.net.sf.thingamablog.util.io.Closer;
+import net.sf.thingamablog.util.io.Closer;
/**
* Implementation of the <code>ClientPutComplexDir</code> command. This
Modified:
trunk/apps/thingamablog/src/net/sf/thingamablog/util/freenet/fcp/Connection.java
===================================================================
---
trunk/apps/thingamablog/src/net/sf/thingamablog/util/freenet/fcp/Connection.java
2008-04-14 02:37:31 UTC (rev 19286)
+++
trunk/apps/thingamablog/src/net/sf/thingamablog/util/freenet/fcp/Connection.java
2008-04-14 02:41:21 UTC (rev 19287)
@@ -32,10 +32,10 @@
import java.util.Iterator;
import java.util.List;
-import src.net.sf.thingamablog.util.io.Closer;
-import src.net.sf.thingamablog.util.io.LineInputStream;
-import src.net.sf.thingamablog.util.io.StreamCopier;
-import src.net.sf.thingamablog.util.io.TempFileInputStream;
+import net.sf.thingamablog.util.io.Closer;
+import net.sf.thingamablog.util.io.LineInputStream;
+import net.sf.thingamablog.util.io.StreamCopier;
+import net.sf.thingamablog.util.io.TempFileInputStream;
/**
* A physical connection to a Freenet node.
Modified: trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/Closer.java
===================================================================
--- trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/Closer.java
2008-04-14 02:37:31 UTC (rev 19286)
+++ trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/Closer.java
2008-04-14 02:41:21 UTC (rev 19287)
@@ -16,7 +16,7 @@
* Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-package src.net.sf.thingamablog.util.io;
+package net.sf.thingamablog.util.io;
import java.io.IOException;
import java.io.InputStream;
Modified:
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/LineInputStream.java
===================================================================
---
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/LineInputStream.java
2008-04-14 02:37:31 UTC (rev 19286)
+++
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/LineInputStream.java
2008-04-14 02:41:21 UTC (rev 19287)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-package src.net.sf.thingamablog.util.io;
+package net.sf.thingamablog.util.io;
import java.io.FilterInputStream;
import java.io.IOException;
Modified:
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/ReplacingOutputStream.java
===================================================================
---
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/ReplacingOutputStream.java
2008-04-14 02:37:31 UTC (rev 19286)
+++
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/ReplacingOutputStream.java
2008-04-14 02:41:21 UTC (rev 19287)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-package src.net.sf.thingamablog.util.io;
+package net.sf.thingamablog.util.io;
import java.io.FilterOutputStream;
import java.io.IOException;
Modified:
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/StreamCopier.java
===================================================================
--- trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/StreamCopier.java
2008-04-14 02:37:31 UTC (rev 19286)
+++ trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/StreamCopier.java
2008-04-14 02:41:21 UTC (rev 19287)
@@ -14,7 +14,7 @@
* Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-package src.net.sf.thingamablog.util.io;
+package net.sf.thingamablog.util.io;
import java.io.EOFException;
import java.io.IOException;
Modified:
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/TempFileInputStream.java
===================================================================
---
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/TempFileInputStream.java
2008-04-14 02:37:31 UTC (rev 19286)
+++
trunk/apps/thingamablog/src/net/sf/thingamablog/util/io/TempFileInputStream.java
2008-04-14 02:41:21 UTC (rev 19287)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-package src.net.sf.thingamablog.util.io;
+package net.sf.thingamablog.util.io;
import java.io.File;
import java.io.FileInputStream;
