[Plog4u-devel] net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor WikiEditorPlugin.java,1.6,1.7

[Axel C. K. <ax...@us...>]

Update of /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8618/src/net/sourceforge/phpeclipse/wiki/editor

Modified Files:
	WikiEditorPlugin.java 
Log Message:
Properties for "unknown" operating systems :-)


Index: WikiEditorPlugin.java
===================================================================
RCS file: /cvsroot/plog4u/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor/WikiEditorPlugin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WikiEditorPlugin.java	21 Oct 2005 19:45:16 -0000	1.6
--- WikiEditorPlugin.java	28 Feb 2006 17:51:03 -0000	1.7
***************
*** 327,331 ****
  		// CONFIGURATION_TYPES.add(PREFIX_STORE + PREDEFINED_WIKIS[i]);
  		// }
! 		
  		list = loadSOAPFavorites();
  		for (int i = 0; i < list.size(); i++) {
--- 327,331 ----
  		// CONFIGURATION_TYPES.add(PREFIX_STORE + PREDEFINED_WIKIS[i]);
  		// }
! 
  		list = loadSOAPFavorites();
  		for (int i = 0; i < list.size(); i++) {
***************
*** 333,340 ****
  					new WikiProperties((String) list.get(i))));
  		}
! 		for (int i = 0; i < list.size(); i++) { 
  			CONFIGURATION_TYPES.add(PREFIX_YAWIKI + (String) list.get(i));
  		}
! 		
  		manager = ConfigurationManager.getInstance();
  		try {
--- 333,340 ----
  					new WikiProperties((String) list.get(i))));
  		}
! 		for (int i = 0; i < list.size(); i++) {
  			CONFIGURATION_TYPES.add(PREFIX_YAWIKI + (String) list.get(i));
  		}
! 
  		manager = ConfigurationManager.getInstance();
  		try {
***************
*** 427,434 ****
  		// operatingSystem ==> maxosx, linux, solaris, win32,...
  		try {
! 			InputStream is = getDefault()
! 					.openStream(
! 							new Path("prefs/default_" + operatingSystem
! 									+ ".properties"));
  			PropertyResourceBundle resourceBundle = new PropertyResourceBundle(
  					is);
--- 427,440 ----
  		// operatingSystem ==> maxosx, linux, solaris, win32,...
  		try {
! 			InputStream is = null;
! 			try {
! 				is = getDefault().openStream(
! 						new Path("prefs/default_" + operatingSystem
! 								+ ".properties"));
! 			} catch (IOException ioe) {
! 				// use this as the default settings:
! 				is = getDefault().openStream(
! 						new Path("prefs/default_unknown.properties"));
! 			}
  			PropertyResourceBundle resourceBundle = new PropertyResourceBundle(
  					is);
***************
*** 540,543 ****
--- 546,557 ----
  
  		} catch (Exception e) {
+ 				store.setDefault(EDITOR_WRAP_WORDS, "false");
+ 				store.setDefault(HTTP_GET_THROTTLE, "1000"); // 1 second
+ 				store.setDefault(HTTP_PUT_THROTTLE, "5000"); // 5 seconds
+ 				store.setDefault(HTTP_TIMEOUT, "30000"); // 30 seconds timeout
+ 				store.setDefault(HTTP_PROXYHOST, System.getProperty(HTTP_PROXYHOST, ""));
+ 				store.setDefault(HTTP_PROXYPORT, System.getProperty(HTTP_PROXYPORT, "80"));
+ 				store.setDefault(HTTP_PROXYUSERNAME, System.getProperty(HTTP_PROXYUSERNAME, ""));
+ 				store.setDefault(HTTP_PROXYPASSWORD, System.getProperty(HTTP_PROXYPASSWORD, ""));
  		}