[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3062 - in freeway/src/org/gnu/freeway: . protocol/afs/swin
|
From: |
mdonoughe |
|
Subject: |
[GNUnet-SVN] r3062 - in freeway/src/org/gnu/freeway: . protocol/afs/swing server util util/crypto util/net util/ui |
|
Date: |
Mon, 26 Jun 2006 12:05:58 -0700 (PDT) |
Author: mdonoughe
Date: 2006-06-26 12:05:51 -0700 (Mon, 26 Jun 2006)
New Revision: 3062
Modified:
freeway/src/org/gnu/freeway/AbstractApplication.java
freeway/src/org/gnu/freeway/AbstractServer.java
freeway/src/org/gnu/freeway/DaemonLauncher.java
freeway/src/org/gnu/freeway/GNUNetConfig.java
freeway/src/org/gnu/freeway/GNUNetUIConfig.java
freeway/src/org/gnu/freeway/protocol/afs/swing/InsertDialog.java
freeway/src/org/gnu/freeway/server/ClientServer.java
freeway/src/org/gnu/freeway/server/LocalIdentity.java
freeway/src/org/gnu/freeway/util/LoggedObject.java
freeway/src/org/gnu/freeway/util/Prefs.java
freeway/src/org/gnu/freeway/util/crypto/HashCode160.java
freeway/src/org/gnu/freeway/util/crypto/HostIdentity.java
freeway/src/org/gnu/freeway/util/net/CSNativeMessage.java
freeway/src/org/gnu/freeway/util/net/PersistentDecoder.java
freeway/src/org/gnu/freeway/util/ui/UIHelper.java
Log:
no longer stores any preferences in the ~/.java folder.
uses ~/.gnunet instead of ~/.freeway
mostly broke logging
Modified: freeway/src/org/gnu/freeway/AbstractApplication.java
===================================================================
--- freeway/src/org/gnu/freeway/AbstractApplication.java 2006-06-26
18:42:03 UTC (rev 3061)
+++ freeway/src/org/gnu/freeway/AbstractApplication.java 2006-06-26
19:05:51 UTC (rev 3062)
@@ -47,7 +47,7 @@
addCritical(new AbstractAction("FLUSH-PREFS") {
public void perform()
{
- preferences.flushGlobals();
+ //preferences.flushGlobals();
LoggedObject.flushLogs();
}
});
@@ -82,15 +82,13 @@
public DirLocation getHome()
{
DirLocation dir;
- String str;
- str=(daemon ? "GNUNETD_HOME" : "GNUNET_HOME");
-
- dir=preferences.getDirLocation("",str);
+ dir=preferences.getDirLocation(daemon ? "GNUNETD" :
"GNUNET",daemon ? "GNUNETD_HOME" : "GNUNET_HOME");
if (dir==null) {
- log(Level.SEVERE,"Configuration file must specify a
directory for GNUnet to store per-peer data under "+str+" ! Uses \"~\"...");
- dir=new DirLocation("~");
+ log(Level.SEVERE,"Configuration file must specify a
directory for GNUnet to store per-peer data ! Uses \"~/.gnunet\"...");
+ dir=new DirLocation("~/.gnunet");
}
+ log(Level.SEVERE,"exit getHome");
return (dir.create() ? dir : null);
}
@@ -106,7 +104,8 @@
String str;
str=preferences.getString((daemon ? "GNUNETD" :
"GNUNET"),"LOGLEVEL","WARNING");
- level=Level.parse(str);
+ //level=Level.parse(str); //TODO: map between C and Java levels
+ level = Level.FINEST;
f=preferences.getFileLocation((daemon ? "GNUNETD" :
"GNUNET"),"LOGFILE");
if (f==null || !LoggedObject.sendLogsToFile(level,f)) {
@@ -137,7 +136,7 @@
resetLogs();
preferences.registerConfigurationUpdateCallback(resetAction);
- str=preferences.getString((daemon ? "GNUNETD" :
"GNUNET"),"CRYPTO_PROVIDER",null);
+ str=preferences.getString((daemon ? "GNUNETD" :
"GNUNET"),"CRYPTO_PROVIDER","org.bouncycastle.jce.provider.BouncyCastleProvider");
if (str!=null) {
try {
Security.insertProviderAt((Provider)
Class.forName(str).newInstance(),0);
@@ -289,10 +288,11 @@
public static void launch( Class c, String[] args )
{
+ //TODO: GNUNetConfig needs rewritten
// check minimal system config., launch configuration wizard if
needed
- if (!c.equals(GNUNetUIConfig.class) &&
!c.equals(GNUNetConfig.class)) {
- Prefs.ensureInitialized();
- }
+ //if (!c.equals(GNUNetUIConfig.class) &&
!c.equals(GNUNetConfig.class)) {
+ // Prefs.ensureInitialized();
+ // }
Command.launch(c,args);
}
Modified: freeway/src/org/gnu/freeway/AbstractServer.java
===================================================================
--- freeway/src/org/gnu/freeway/AbstractServer.java 2006-06-26 18:42:03 UTC
(rev 3061)
+++ freeway/src/org/gnu/freeway/AbstractServer.java 2006-06-26 19:05:51 UTC
(rev 3062)
@@ -4,6 +4,8 @@
package org.gnu.freeway;
+import java.util.logging.Level;
+
import org.gnu.freeway.server.*;
import org.gnu.freeway.transport.*;
import org.gnu.freeway.util.*;
Modified: freeway/src/org/gnu/freeway/DaemonLauncher.java
===================================================================
--- freeway/src/org/gnu/freeway/DaemonLauncher.java 2006-06-26 18:42:03 UTC
(rev 3061)
+++ freeway/src/org/gnu/freeway/DaemonLauncher.java 2006-06-26 19:05:51 UTC
(rev 3062)
@@ -139,7 +139,7 @@
return false;
}
-
str=prefs.getGlobalString(Prefs.CONFIG_NODE,Prefs.CLIENTS_BASEDIR_NAME)+File.separator+"remote";
+ str=prefs.getString("GNUNETD", "GNUNETD_HOME",
"~/.gnunet")+File.separator+"remote";
baseDir=new DirLocation(str);
if (!baseDir.create()) {
Modified: freeway/src/org/gnu/freeway/GNUNetConfig.java
===================================================================
--- freeway/src/org/gnu/freeway/GNUNetConfig.java 2006-06-26 18:42:03 UTC
(rev 3061)
+++ freeway/src/org/gnu/freeway/GNUNetConfig.java 2006-06-26 19:05:51 UTC
(rev 3062)
@@ -1,7 +1,10 @@
/**
* @PROJECT_INFO@
- */
+ *//*
+
+//TODO: this needs rewritten to use ~/.gnunet
+
package org.gnu.freeway;
import org.gnu.freeway.util.*;
@@ -9,10 +12,11 @@
import java.io.*;
import java.sql.*;
+import java.util.logging.Level;
-/**
+*//**
*
- */
+ *//*
public class GNUNetConfig extends AbstractClient
{
@@ -25,7 +29,8 @@
protected GNUNetConfig()
{
super("gnunet-config",Utils.makeVersion(1,0,0));
- prefs=getPreferences();
+ prefs=new Prefs();
+ prefs.readConfiguration(true);
doErase=false;
doForce=false;
doPrint=false;
@@ -89,57 +94,43 @@
if (doErase) {
ret=askChoice("Do you *really* want to erase all
configuration information ?","yes|no",1,false);
if (ret==0) {
- prefs.eraseGlobals();
+ log(Level.SEVERE,"erasing prefs mot
implemented??");
}
return 0;
}
- check=false;
+ str=prefs.getSystemDaemonConfiguration();
+ if (str!=null && !new FileLocation(str).exists()) {
+ //message("Create daemon configuration file. You can
customize it later by editing \""+str+"\".");
+
//prefs.copyTemplateWithGlobals("gnunet.daemon.template",new FileLocation(str));
+ message("Copying template not implemented!");
+ return 1;
+ }
+
+ str=prefs.getSystemClientsConfiguration();
+ if (str!=null && !new FileLocation(str).exists()) {
+ //message("Create tools configuration file. You can
customize it later by editing \""+str+"\".");
+
//prefs.copyTemplateWithGlobals("gnunet.client.template",new FileLocation(str));
+ message("Copying template not implemented!");
+ return 1;
+ }
+
if (doForce || !prefs.isSystemInitialized()) {
- if (doForce ||
!prefs.hasGlobalString(Prefs.CONFIG_NODE,Prefs.DAEMON_BASEDIR_NAME)) {
+ if (doForce || prefs.getString("GNUNETD",
"GNUNETD_HOME", null) == null) {
str=askDirectory("Home directory for freeway
daemon ?",Prefs.DAEMON_BASEDIR_NAME,Prefs.DAEMON_BASEDIR_DEFAULT);
-
prefs.setGlobalString(Prefs.CONFIG_NODE,Prefs.DAEMON_BASEDIR_NAME,str);
+ prefs.setString("GNUNETD","GNUNETD_HOME",str);
}
+ }
- if (doForce ||
!prefs.hasGlobalString(Prefs.CONFIG_NODE,Prefs.CLIENTS_BASEDIR_NAME)) {
+ if (doForce || cprefs.getString("GNUNET","GNUNET_HOME",
null) == null) {
str=askDirectory("Home directory for freeway
clients ?",Prefs.CLIENTS_BASEDIR_NAME,Prefs.CLIENTS_BASEDIR_DEFAULT);
-
prefs.setGlobalString(Prefs.CONFIG_NODE,Prefs.CLIENTS_BASEDIR_NAME,str);
+
cprefs.setGlobalString(Prefs.CONFIG_NODE,Prefs.CLIENTS_BASEDIR_NAME,str);
}
- if (doForce ||
!prefs.hasGlobalString(Prefs.CONFIG_NODE,Prefs.MYSQL_HOST_NAME)) {
- str=askWithDefaultNotNull("MySQL host
?",prefs.getGlobalString(Prefs.CONFIG_NODE,Prefs.MYSQL_HOST_NAME,Prefs.MYSQL_HOST_DEFAULT));
-
prefs.setGlobalString(Prefs.CONFIG_NODE,Prefs.MYSQL_HOST_NAME,str);
- }
-
- if (doForce ||
!prefs.hasGlobalString(Prefs.CONFIG_NODE,Prefs.MYSQL_USER_NAME)) {
- str=askWithDefaultNotNull("MySQL user
?",prefs.getGlobalString(Prefs.CONFIG_NODE,Prefs.MYSQL_USER_NAME,Prefs.MYSQL_USER_DEFAULT));
-
prefs.setGlobalString(Prefs.CONFIG_NODE,Prefs.MYSQL_USER_NAME,str);
- check=true;
- }
-
- if (doForce ||
!prefs.hasGlobalString(Prefs.CONFIG_NODE,Prefs.MYSQL_PASSWORD_NAME)) {
- str=askWithDefaultNullable("MySQL password
?",prefs.getGlobalString(Prefs.CONFIG_NODE,Prefs.MYSQL_PASSWORD_NAME,Prefs.MYSQL_PASSWORD_DEFAULT));
-
prefs.setGlobalString(Prefs.CONFIG_NODE,Prefs.MYSQL_PASSWORD_NAME,str);
- check=true;
- }
- }
-
- if (check && !checkForMySQL()) {
+ if (!checkForMySQL()) {
error("Failed to connect to MySQL database. Check your
MySQL configuration and re-run program later.");
}
- str=prefs.getSystemDaemonConfiguration();
- if (str!=null && !new FileLocation(str).exists()) {
- message("Create daemon configuration file. You can
customize it later by editing \""+str+"\".");
-
prefs.copyTemplateWithGlobals("gnunet.daemon.template",new FileLocation(str));
- }
-
- str=prefs.getSystemClientsConfiguration();
- if (str!=null && !new FileLocation(str).exists()) {
- message("Create tools configuration file. You can
customize it later by editing \""+str+"\".");
-
prefs.copyTemplateWithGlobals("gnunet.client.template",new FileLocation(str));
- }
-
if (prefs.isSystemInitialized()) {
message("Configuration entries are okay. Please have a
look to \""+prefs.getSystemDaemonConfiguration()+"\" and
\""+prefs.getSystemClientsConfiguration()+"\" for further customizations.");
}
@@ -287,3 +278,4 @@
launch(GNUNetConfig.class,args);
}
}
+*/
\ No newline at end of file
Modified: freeway/src/org/gnu/freeway/GNUNetUIConfig.java
===================================================================
--- freeway/src/org/gnu/freeway/GNUNetUIConfig.java 2006-06-26 18:42:03 UTC
(rev 3061)
+++ freeway/src/org/gnu/freeway/GNUNetUIConfig.java 2006-06-26 19:05:51 UTC
(rev 3062)
@@ -1,7 +1,9 @@
/**
* @PROJECT_INFO@
- */
+ *//*
+//TODO: this needs rewritten
+
package org.gnu.freeway;
import org.gnu.freeway.util.*;
@@ -17,9 +19,9 @@
import javax.swing.*;
import javax.swing.text.*;
-/**
+*//**
*
- */
+ *//*
public class GNUNetUIConfig extends AbstractClient
{
@@ -622,3 +624,4 @@
}
}
}
+*/
\ No newline at end of file
Modified: freeway/src/org/gnu/freeway/protocol/afs/swing/InsertDialog.java
===================================================================
--- freeway/src/org/gnu/freeway/protocol/afs/swing/InsertDialog.java
2006-06-26 18:42:03 UTC (rev 3061)
+++ freeway/src/org/gnu/freeway/protocol/afs/swing/InsertDialog.java
2006-06-26 19:05:51 UTC (rev 3062)
@@ -76,7 +76,7 @@
prefs=controller.getApplication().getPreferences();
- chosenBase=new
DirLocation(prefs.getGlobalString("insert","directory",""));
+ chosenBase=new DirLocation("~");
chosenFile=null;
chosenFilename="";
chosenMime="";
@@ -90,7 +90,7 @@
Prefs prefs;
prefs=controller.getApplication().getPreferences();
- prefs.setGlobalString("insert","directory",(chosenBase!=null ?
chosenBase.getLabel() : ""));
+ //prefs.setGlobalString("insert","directory",(chosenBase!=null
? chosenBase.getLabel() : ""));
super.close();
}
Modified: freeway/src/org/gnu/freeway/server/ClientServer.java
===================================================================
--- freeway/src/org/gnu/freeway/server/ClientServer.java 2006-06-26
18:42:03 UTC (rev 3061)
+++ freeway/src/org/gnu/freeway/server/ClientServer.java 2006-06-26
19:05:51 UTC (rev 3062)
@@ -185,7 +185,6 @@
type=msg.getType();
synchronized(handlers) {
hd=getCSHandler(type);
- System.err.println("PLEASE USE: " + hd);
if (hd==null) {
log(Level.INFO,"Client-server message
not understood (type is "+type+") !");
err=true;
@@ -258,7 +257,6 @@
log(Level.WARNING,"Invalid type : "+type+"
!!!");
return false;
}
-System.err.println("REG: " + type + " " + hd);
//TODO: handlers needs to be a map
/*if (type<handlers.size() && handlers.get(type)!=null)
{
log(Level.WARNING,"Failed to register handler,
slot "+type+" used.");
@@ -326,7 +324,6 @@
public boolean handle( CSSession client, CSMessage msg )
{
- System.err.println("HANDLE: " + msg);
/*if (msg instanceof CSStatisticsRequest) {
return handleStatistics(client,(CSStatisticsRequest)
msg);
}
Modified: freeway/src/org/gnu/freeway/server/LocalIdentity.java
===================================================================
--- freeway/src/org/gnu/freeway/server/LocalIdentity.java 2006-06-26
18:42:03 UTC (rev 3061)
+++ freeway/src/org/gnu/freeway/server/LocalIdentity.java 2006-06-26
19:05:51 UTC (rev 3062)
@@ -101,7 +101,6 @@
if (privateKey==null) {
log(Level.INFO,"Creating new key pair (this may take a
while)...");
-
privateKey=PrivateKey.create();
if (privateKey==null) {
log(Level.SEVERE,"Could not create key pair !");
Modified: freeway/src/org/gnu/freeway/util/LoggedObject.java
===================================================================
--- freeway/src/org/gnu/freeway/util/LoggedObject.java 2006-06-26 18:42:03 UTC
(rev 3061)
+++ freeway/src/org/gnu/freeway/util/LoggedObject.java 2006-06-26 19:05:51 UTC
(rev 3062)
@@ -69,6 +69,7 @@
protected void log( Level level, String str )
{
+ System.err.println(str);
LogRecord rec;
rec=new LogRecord(level,str);
Modified: freeway/src/org/gnu/freeway/util/Prefs.java
===================================================================
--- freeway/src/org/gnu/freeway/util/Prefs.java 2006-06-26 18:42:03 UTC (rev
3061)
+++ freeway/src/org/gnu/freeway/util/Prefs.java 2006-06-26 19:05:51 UTC (rev
3062)
@@ -13,7 +13,6 @@
import java.nio.charset.*;
import java.util.*;
import java.util.logging.*;
-import java.util.prefs.*;
import java.util.regex.*;
/**
@@ -49,10 +48,10 @@
public static final String CONFIG_NODE
= "config";
public static final String DAEMON_BASEDIR_NAME =
"daemon.basedir";
- public static final String DAEMON_BASEDIR_DEFAULT =
"~/.freeway/daemon";
+ public static final String DAEMON_BASEDIR_DEFAULT =
"~/.gnunet";
public static final String CLIENTS_BASEDIR_NAME =
"clients.basedir";
- public static final String CLIENTS_BASEDIR_DEFAULT =
"~/.freeway/clients";
+ public static final String CLIENTS_BASEDIR_DEFAULT =
"~/.gnunet";
public static final String MYSQL_HOST_NAME =
"mysql.host";
public static final String MYSQL_HOST_DEFAULT =
"localhost";
@@ -67,7 +66,7 @@
private DirLocation base;
- private Preferences prefs;
+ //private Preferences prefs;
/** Map of run-time options (backed by the configuration file). */
private Map dyn;
@@ -79,7 +78,7 @@
public Prefs()
{
super(false);
- prefs=Preferences.userRoot().node(ROOT_PATH);
+ //prefs=Preferences.userRoot().node(ROOT_PATH);
dyn=new HashMap();
callbacks=new ArrayList();
}
@@ -106,27 +105,27 @@
}
//todo: renommer 'Global' en 'Persistent'
- public int getGlobalInt( String section, String name )
+ /*public int getGlobalInt( String section, String name )
{
return getGlobalInt(section,name,0);
- }
+ }*/
- public int getGlobalInt( String section, String name, int def )
+ /*public int getGlobalInt( String section, String name, int def )
{
return prefs.node(section.toLowerCase()).getInt(name,def);
- }
+ }*/
- public void setGlobalInt( String section, String name, int value )
+ /*public void setGlobalInt( String section, String name, int value )
{
prefs.node(section.toLowerCase()).putInt(name,value);
- }
+ }*/
- public boolean hasGlobalString( String section, String name )
+ /*public boolean hasGlobalString( String section, String name )
{
return prefs.node(section.toLowerCase()).get(name,null)!=null;
- }
+ }*/
- public String getGlobalString( String section, String name )
+ /*public String getGlobalString( String section, String name )
{
return getGlobalString(section,name,null);
}
@@ -134,9 +133,9 @@
public String getGlobalString( String section, String name, String def )
{
return prefs.node(section.toLowerCase()).get(name,def);
- }
+ }*/
- public void setGlobalString( String section, String name, String value )
+ /*public void setGlobalString( String section, String name, String
value )
{
prefs.node(section.toLowerCase()).put(name,value);
}
@@ -152,7 +151,7 @@
catch( BackingStoreException x ) {
err("Unable to print preferences !",x);
}
- }
+ }*/
/**
* This is the method you need if you want to remove all system
preferences under "/org/gnu/freeway" tree.
@@ -160,7 +159,7 @@
* @return
*/
- public boolean eraseGlobals()
+ /*public boolean eraseGlobals()
{
try {
prefs.removeNode();
@@ -170,9 +169,9 @@
err("Failed to erase preferences !",x);
}
return false;
- }
+ }*/
- public boolean flushGlobals()
+ /*public boolean flushGlobals()
{
try {
prefs.flush();
@@ -182,9 +181,9 @@
err("Could not flush preferences !",x);
}
return false;
- }
+ }*/
- public boolean copyTemplateWithGlobals( String resName, FileLocation
dest )
+ /*public boolean copyTemplateWithGlobals( String resName, FileLocation
dest )
{
MappedFile f;
Matcher m;
@@ -231,7 +230,7 @@
return false;
}
return true;
- }
+ }*/
/**
@@ -643,10 +642,10 @@
{
String name;
- name=getString("FILES","gnunet.conf",null);
- if (name==null) {
+ //name=getString("FILES","gnunet.conf",null);
+ //if (name==null) {
name=(isDaemon ? getSystemDaemonConfiguration() :
getSystemClientsConfiguration());
- }
+ // }
if (name==null) {
log(Level.WARNING,"Unable to find any configuration
file !");
@@ -769,31 +768,16 @@
public boolean isSystemInitialized()
{
- try {
- if (!prefs.nodeExists(CONFIG_NODE)) {
+ /*if (!prefs.nodeExists(CONFIG_NODE)) {
return false;
}
return hasGlobalString(CONFIG_NODE,DAEMON_BASEDIR_NAME)
&&
hasGlobalString(CONFIG_NODE,CLIENTS_BASEDIR_NAME) &&
hasGlobalString(CONFIG_NODE,MYSQL_HOST_NAME) &&
- hasGlobalString(CONFIG_NODE,MYSQL_USER_NAME);
+ hasGlobalString(CONFIG_NODE,MYSQL_USER_NAME);*/
//todo: vérifier aussi que les repertoires existent et
ont au moins le .conf !
//todo: a statuer
-/* // create directory (~/.gnunet/) and conf. file
- f=File.create(name);
- if (f!=null) {
- // try generating a configuration file
- log(Level.WARNING,"No configuration
file found, trying to create one at "+f.getPath());
-
- generate_gnunetd_conf(f);
- generate_gnunet_conf(f);
- }
-*/
- }
- catch( BackingStoreException x ) {
- err("Unable to access preferences !",x);
- return false;
- }
+ return true;
}
/**
@@ -803,10 +787,7 @@
public String getSystemDaemonConfiguration()
{
- String str;
-
- str=getGlobalString(CONFIG_NODE,DAEMON_BASEDIR_NAME);
- return ((str!=null && str.length()>0) ? str+"/gnunet.conf" :
null);
+ return "~/.gnunet/gnunetd.conf";
}
/**
@@ -816,17 +797,14 @@
public String getSystemClientsConfiguration()
{
- String str;
-
- str=getGlobalString(CONFIG_NODE,CLIENTS_BASEDIR_NAME);
- return ((str!=null && str.length()>0) ? str+"/gnunet.conf" :
null);
+ return "~/.gnunet/gnunet.conf";
}
public File getSystemCache()
{
String str;
//todo: pas bon, si un repertoire n'existe pas, ne pas utiliser "." mais
plutot File.create*temp*file
- str=getGlobalString(CONFIG_NODE,CLIENTS_BASEDIR_NAME,"");
+ str=getString("GNUNET","GNUNET_HOME","");
return new File(str,"cache");
}
@@ -835,11 +813,11 @@
public static void ensureInitialized()
{
- Prefs prefs;
+ //Prefs prefs;
- prefs=new Prefs();
- if (!prefs.isSystemInitialized()) {
- GNUNetUIConfig.fromApp();
- }
+ //prefs=new Prefs();
+ //if (!prefs.isSystemInitialized()) {
+ // GNUNetUIConfig.fromApp();
+ // }
}
}
Modified: freeway/src/org/gnu/freeway/util/crypto/HashCode160.java
===================================================================
--- freeway/src/org/gnu/freeway/util/crypto/HashCode160.java 2006-06-26
18:42:03 UTC (rev 3061)
+++ freeway/src/org/gnu/freeway/util/crypto/HashCode160.java 2006-06-26
19:05:51 UTC (rev 3062)
@@ -318,11 +318,13 @@
h=fromBytes(md.digest());
}
catch( GeneralSecurityException x ) {
+ x.printStackTrace();
logger=Logger.getLogger(HashCode160.class.getName());
logger.log(Level.SEVERE,"Could not compute digest of
message !",x);
h=null;
}
catch( Throwable x ) {
+ x.printStackTrace();
// catch *all* other exceptions, whatever they are
logger=Logger.getLogger(HashCode160.class.getName());
logger.log(Level.SEVERE,"Could not compute digest of
message (unexpected exception) !",x);
Modified: freeway/src/org/gnu/freeway/util/crypto/HostIdentity.java
===================================================================
--- freeway/src/org/gnu/freeway/util/crypto/HostIdentity.java 2006-06-26
18:42:03 UTC (rev 3061)
+++ freeway/src/org/gnu/freeway/util/crypto/HostIdentity.java 2006-06-26
19:05:51 UTC (rev 3062)
@@ -4,6 +4,7 @@
package org.gnu.freeway.util.crypto;
+import org.gnu.freeway.util.LoggedObject;
import org.gnu.freeway.util.net.*;
import java.nio.*;
@@ -13,7 +14,7 @@
*/
//todo: par essence, devrait etre immutable
-public class HostIdentity extends Object implements Persistent
+public class HostIdentity extends LoggedObject implements Persistent
{
public static final int SIZE = HashCode160.SIZE;
@@ -33,7 +34,7 @@
public HostIdentity( HashCode160 h )
{
- super();
+ super(true);
hash=h;
}
Modified: freeway/src/org/gnu/freeway/util/net/CSNativeMessage.java
===================================================================
--- freeway/src/org/gnu/freeway/util/net/CSNativeMessage.java 2006-06-26
18:42:03 UTC (rev 3061)
+++ freeway/src/org/gnu/freeway/util/net/CSNativeMessage.java 2006-06-26
19:05:51 UTC (rev 3062)
@@ -58,7 +58,6 @@
arr = new byte[size];
buf.get(arr);
- System.err.println("LENGTH: " + arr.length);
}
public void writeBytes( ByteBuffer buf )
Modified: freeway/src/org/gnu/freeway/util/net/PersistentDecoder.java
===================================================================
--- freeway/src/org/gnu/freeway/util/net/PersistentDecoder.java 2006-06-26
18:42:03 UTC (rev 3061)
+++ freeway/src/org/gnu/freeway/util/net/PersistentDecoder.java 2006-06-26
19:05:51 UTC (rev 3062)
@@ -205,7 +205,6 @@
Persistent p;
p=null;
- System.err.println("TYPE: " + classes[id].getName());
if (classes[id]!=null) {
try {
if(classes[id].equals(CSNativeMessage.class)) {
Modified: freeway/src/org/gnu/freeway/util/ui/UIHelper.java
===================================================================
--- freeway/src/org/gnu/freeway/util/ui/UIHelper.java 2006-06-26 18:42:03 UTC
(rev 3061)
+++ freeway/src/org/gnu/freeway/util/ui/UIHelper.java 2006-06-26 19:05:51 UTC
(rev 3062)
@@ -92,16 +92,16 @@
public static void restoreDims( Application app, Window w, String id )
{
- Prefs prefs;
+// Prefs prefs;
Dimension size;
int width,height,x,y;
- prefs=app.getPreferences();
+// prefs=app.getPreferences();
- x=prefs.getGlobalInt(app.getName(),id+".window.x",-1);
- y=prefs.getGlobalInt(app.getName(),id+".window.y",-1);
- width=prefs.getGlobalInt(app.getName(),id+".window.width",-1);
- height=prefs.getGlobalInt(app.getName(),id+".window.height",-1);
+ x=-1;
+ y=-1;
+ width=-1;
+ height=-1;
if (x<0 || y<0 || width<16 || height<16) {
size=Toolkit.getDefaultToolkit().getScreenSize();
@@ -116,13 +116,13 @@
public static void saveDims( Application app, Window w, String id )
{
- Prefs prefs;
+ /*Prefs prefs;
prefs=app.getPreferences();
prefs.setGlobalInt(app.getName(),id+".window.x",w.getX());
prefs.setGlobalInt(app.getName(),id+".window.y",w.getY());
prefs.setGlobalInt(app.getName(),id+".window.width",w.getWidth());
-
prefs.setGlobalInt(app.getName(),id+".window.height",w.getHeight());
+
prefs.setGlobalInt(app.getName(),id+".window.height",w.getHeight());*/
}
public static JMenu createLAFMenu( Application app )
@@ -153,7 +153,7 @@
public void actionPerformed(
ActionEvent evt )
{
setLAF(_str);
-
_prefs.setGlobalString(_name,"laf.classname",_str);
+
//_prefs.setGlobalString(_name,"laf.classname",_str);
}
});
menu.add(item);
@@ -169,10 +169,10 @@
String str;
if (!lafOnce) {
-
str=app.getPreferences().getGlobalString(app.getName(),"laf.classname","");
- if (str.length()>0) {
- setLAF(str);
- }
+
//str=app.getPreferences().getGlobalString(app.getName(),"laf.classname","");
+ //if (str.length()>0) {
+ // setLAF(str);
+ // }
lafOnce=true;
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3062 - in freeway/src/org/gnu/freeway: . protocol/afs/swing server util util/crypto util/net util/ui,
mdonoughe <=