[Compiere-cvslog] CVS: base/src/org/compiere/util DB.java,1.18,1.19 Env.java,1.18,1.19 Log.java,1.15,1.16 Ini.java,1.12,NONE IniDialog.java,1.2,NONE IniDialog.jbx,1.1,NONE IniRes.java,1.1,NONE IniRes_de.java,1.1,NONE KeyNamePair.java,1.2,NONE KeyNamePair.jbx,1.1.1.2,NONE Language.java,1.1,NONE NamePair.java,1.2,NONE Secure.java,1.2,NONE ValueNamePair.java,1.2,NONE

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/base/src/org/compiere/util
In directory usw-pr-cvs1:/tmp/cvs-serv32240/util

Modified Files:
	DB.java Env.java Log.java 
Removed Files:
	Ini.java IniDialog.java IniDialog.jbx IniRes.java 
	IniRes_de.java KeyNamePair.java KeyNamePair.jbx Language.java 
	NamePair.java Secure.java ValueNamePair.java 
Log Message:
.

Index: DB.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/util/DB.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DB.java	2002/01/07 06:26:55	1.18
--- DB.java	2002/01/09 17:20:07	1.19
***************
*** 25,28 ****
--- 25,30 ----
  import oracle.sql.*;
  
+ import org.compiere.util.KeyNamePair;
+ 
  /**
   *  General Database Interface

Index: Env.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/util/Env.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Env.java	2002/01/08 06:19:18	1.18
--- Env.java	2002/01/09 17:20:07	1.19
***************
*** 26,29 ****
--- 26,32 ----
  
  import org.compiere.model.*;
+ import org.compiere.util.KeyNamePair;
+ import org.compiere.util.Language;
+ 
  
  /**

Index: Log.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/util/Log.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Log.java	2002/01/09 07:00:29	1.15
--- Log.java	2002/01/09 17:20:08	1.16
***************
*** 20,23 ****
--- 20,25 ----
  import java.text.*;
  
+ import org.compiere.util.ValueNamePair;
+ 
  /**
   *  Logging  Facilities
***************
*** 467,517 ****
  		return true;
  	}	//	error
- 
- 	/*************************************************************************/
- 
- 	/**
- 	 *  Get Stack trace
- 	 *  @param caller
- 	 *  @return string with stack trace
- 	 */
- 	private static String getStackTrace (Throwable caller)
- 	{
- 		Throwable t = caller;
- 		if (t == null)
- 			t = new Throwable();
- 		StringWriter sw = new StringWriter();
- 		PrintWriter pw = new PrintWriter(sw);
- 		t.printStackTrace(pw);
- 		pw.close();
- 		return sw.toString();
- 	}   //  getStackTrace
- 
- 	/**
- 	 *  Get Caller
- 	 *
- 	 * @param caller
- 	 * @return Array of class.method(file:line)
- 	 */
- 	public static String[] getCaller (Throwable caller)
- 	{
- 		ArrayList list = new ArrayList();
- 		StringTokenizer st = new StringTokenizer(getStackTrace(caller));
- 		while (st.hasMoreTokens())
- 		{
- 			String token = st.nextToken();
- 			//  ignore
- 			if (token.equals("at")
- 				|| token.equals("java.lang.Throwable")
- 				|| token.startsWith("org.compiere.util.Log."))
- 				;
- 			else
- 			{
- 				list.add(token);
- 			}
- 		}
- 		String[] retValue = new String[list.size()];
- 		list.toArray(retValue);
- 		return retValue;
- 	}   //  getCaller
  
  	/*************************************************************************/
--- 469,472 ----

--- Ini.java DELETED ---

--- IniDialog.java DELETED ---

--- IniDialog.jbx DELETED ---

--- IniRes.java DELETED ---

--- IniRes_de.java DELETED ---

--- KeyNamePair.java DELETED ---

--- KeyNamePair.jbx DELETED ---

--- Language.java DELETED ---

--- NamePair.java DELETED ---

--- Secure.java DELETED ---

--- ValueNamePair.java DELETED ---

[Compiere-cvslog] CVS: base/src/org/compiere/model MTab.java,1.13,1.14

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/base/src/org/compiere/model
In directory usw-pr-cvs1:/tmp/cvs-serv32240/model

Modified Files:
	MTab.java 
Log Message:
.

Index: MTab.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/model/MTab.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MTab.java	2001/12/17 05:38:33	1.13
--- MTab.java	2002/01/09 17:20:07	1.14
***************
*** 21,24 ****
--- 21,25 ----
  import java.io.*;
  
+ import org.compiere.util.ValueNamePair;
  import org.compiere.util.*;
  import com.compiere.custom.*;

[Compiere-cvslog] CVS: base/src/org/compiere license.htm,1.1,NONE

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/base/src/org/compiere
In directory usw-pr-cvs1:/tmp/cvs-serv32240

Removed Files:
	license.htm 
Log Message:
.

--- license.htm DELETED ---

[Compiere-cvslog] CVS: base/src/org/compiere/swing CButton.java,1.1,NONE CPanel.java,1.1,NONE

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/base/src/org/compiere/swing
In directory usw-pr-cvs1:/tmp/cvs-serv31709

Removed Files:
	CButton.java CPanel.java 
Log Message:
.

--- CButton.java DELETED ---

--- CPanel.java DELETED ---

[Compiere-cvslog] CVS: base/src/org/compiere/plaf Cancel24.gif,1.1,NONE CompiereButtonUI.java,1.6,NONE CompiereCheckBoxUI.java,1.2,NONE CompiereColor.java,1.2,NONE CompiereColorEditor.java,1.3,NONE CompiereColorEditor.jbx,1.1,NONE CompiereLookAndFeel.java,1.6,NONE CompierePLAF.java,1.7,NONE CompierePLAFEditor.java,1.6,NONE CompierePanelUI.java,1.7,NONE CompiereRadioButtonUI.java,1.2,NONE CompiereTabbedPaneUI.java,1.8,NONE CompiereTableHeaderUI.java,1.5,NONE CompiereTheme.java,1.5,NONE CompiereThemeEditor.java,1.6,NONE CompiereToggleButtonUI.java,1.6,NONE CompiereUtils.java,1.6,NONE FontChooser.java,1.5,NONE Ok24.gif,1.1,NONE PLAFEditor.jbx,1.1,NONE Res.java,1.2,NONE Res_de.java,1.1,NONE background.jpg,1.3,NONE

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/base/src/org/compiere/plaf
In directory usw-pr-cvs1:/tmp/cvs-serv31409

Removed Files:
	Cancel24.gif CompiereButtonUI.java CompiereCheckBoxUI.java 
	CompiereColor.java CompiereColorEditor.java 
	CompiereColorEditor.jbx CompiereLookAndFeel.java 
	CompierePLAF.java CompierePLAFEditor.java CompierePanelUI.java 
	CompiereRadioButtonUI.java CompiereTabbedPaneUI.java 
	CompiereTableHeaderUI.java CompiereTheme.java 
	CompiereThemeEditor.java CompiereToggleButtonUI.java 
	CompiereUtils.java FontChooser.java Ok24.gif PLAFEditor.jbx 
	Res.java Res_de.java background.jpg 
Log Message:
.

--- Cancel24.gif DELETED ---

--- CompiereButtonUI.java DELETED ---

--- CompiereCheckBoxUI.java DELETED ---

--- CompiereColor.java DELETED ---

--- CompiereColorEditor.java DELETED ---

--- CompiereColorEditor.jbx DELETED ---

--- CompiereLookAndFeel.java DELETED ---

--- CompierePLAF.java DELETED ---

--- CompierePLAFEditor.java DELETED ---

--- CompierePanelUI.java DELETED ---

--- CompiereRadioButtonUI.java DELETED ---

--- CompiereTabbedPaneUI.java DELETED ---

--- CompiereTableHeaderUI.java DELETED ---

--- CompiereTheme.java DELETED ---

--- CompiereThemeEditor.java DELETED ---

--- CompiereToggleButtonUI.java DELETED ---

--- CompiereUtils.java DELETED ---

--- FontChooser.java DELETED ---

--- Ok24.gif DELETED ---

--- PLAFEditor.jbx DELETED ---

--- Res.java DELETED ---

--- Res_de.java DELETED ---

--- background.jpg DELETED ---

[Compiere-cvslog] CVS: dbPort - Imported sources

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/dbPort
In directory usw-pr-cvs1:/tmp/cvs-serv30498

Log Message:
.

Status:

Vendor Tag:	compiere
Release Tags:	start
		
N dbPort/dbPort.html
N dbPort/dbPort.jpx
N dbPort/dbPort.jpx.local
N dbPort/src/org/compiere/db/Database.java

No conflicts created by this import


***** Bogus filespec: - Imported sources

[Compiere-cvslog] CVS: looks - Imported sources

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/looks
In directory usw-pr-cvs1:/tmp/cvs-serv28212

Log Message:
.

Status:

Vendor Tag:	compiere
Release Tags:	start
		
N looks/Looks.html
N looks/Looks.jpx
N looks/Looks.jpx.local
N looks/src/org/compiere/license.htm
N looks/src/org/compiere/plaf/Cancel24.gif
N looks/src/org/compiere/plaf/Compiere200x100.gif
N looks/src/org/compiere/plaf/CompiereButtonUI.java
N looks/src/org/compiere/plaf/CompiereCheckBoxUI.java
N looks/src/org/compiere/plaf/CompiereColor.java
N looks/src/org/compiere/plaf/CompiereColorEditor.java
N looks/src/org/compiere/plaf/CompiereLookAndFeel.java
N looks/src/org/compiere/plaf/CompierePanelUI.java
N looks/src/org/compiere/plaf/CompierePLAF.java
N looks/src/org/compiere/plaf/CompierePLAFEditor.java
N looks/src/org/compiere/plaf/CompiereRadioButtonUI.java
N looks/src/org/compiere/plaf/CompiereTabbedPaneUI.java
N looks/src/org/compiere/plaf/CompiereTableHeaderUI.java
N looks/src/org/compiere/plaf/CompiereTheme.java
N looks/src/org/compiere/plaf/CompiereThemeEditor.java
N looks/src/org/compiere/plaf/CompiereToggleButtonUI.java
N looks/src/org/compiere/plaf/CompiereUtils.java
N looks/src/org/compiere/plaf/FontChooser.java
N looks/src/org/compiere/plaf/Ok24.gif
N looks/src/org/compiere/plaf/Res.java
N looks/src/org/compiere/plaf/Res_de.java
N looks/src/org/compiere/plaf/vincent.jpg
N looks/src/org/compiere/swing/CButton.java
N looks/src/org/compiere/swing/CPanel.java
N looks/src/org/compiere/util/Ini.java
N looks/src/org/compiere/util/IniDialog.java
N looks/src/org/compiere/util/IniRes.java
N looks/src/org/compiere/util/IniRes_de.java
N looks/src/org/compiere/util/KeyNamePair.java
N looks/src/org/compiere/util/Language.java
N looks/src/org/compiere/util/NamePair.java
N looks/src/org/compiere/util/Secure.java
N looks/src/org/compiere/util/Trace.java
N looks/src/org/compiere/util/ValueNamePair.java

No conflicts created by this import


***** Bogus filespec: - Imported sources

[Compiere-cvslog] CVS: client/Src/org/compiere/apps ALoginConnectRes_fr.java,NONE,1.1 ALoginRes_fr.java,NONE,1.1

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/client/Src/org/compiere/apps
In directory usw-pr-cvs1:/tmp/cvs-serv31455/Src/org/compiere/apps

Added Files:
	ALoginConnectRes_fr.java ALoginRes_fr.java 
Log Message:
.

--- NEW FILE: ALoginConnectRes_fr.java ---
/******************************************************************************
 * The contents of this file are subject to the   Compiere License  Version 1.1
 * ("License"); You may not use this file except in compliance with the License
 * You may obtain a copy of the License at http://www.compiere.org/license.html
 * Software distributed under the License is distributed on an  "AS IS"  basis,
 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 * the specific language governing rights and limitations under the License.
 * The Original Code is                  Compiere  ERP & CRM  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
 * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
 * Contributor(s): ______________________________________.
 *****************************************************************************/
package org.compiere.apps;

import java.util.*;

/**
 *  Base Resource Bundle for Server Connect
 *
 * 	@author 	Franck Sebbah (fsebbah@...)
 * 	@version 	$Id: ALoginConnectRes_fr.java,v 1.1 2002/01/09 07:02:20 jjanke Exp $
 */
public class ALoginConnectRes_fr extends java.util.ListResourceBundle
{
	static final Object[][] contents = new String[][]{
	{ "Server", "Paramètre du serveur de connexion" },         //  titre

	{ "ManualOverwrite", "Corrections manuels" },
	{ "SaveServerInfo", "Sauvegarder les paramètres de connexion" },

	{ "ApplicationServer", "Paramètres du serveur" },
	{ "DatabaseServer", "Paramètres de connexion à la base" },
	{ "ConnectionServer", "Paramètres de connexion du Manager (Option)" },

	{ "ConnectionManager", "Utilisation de la connexion Manager" },
	{ "CMHost", "Adresse de connexion du Manager" },
	{ "CMPort", "Port de connexion du Manager " },

	{ "DBHost", "Serveur de la base" },
	{ "DBPort", "Port de la base" },
	{ "DBSID", "SID de la base " },
	{ "DBUid", "Identifiant utilisateur " },
	{ "DBPwd", "Mot de passe " },

	{ "ServerHost", "Adresse du Serveur" },
	{ "ServerPort", "Port du serveur" },
	{ "ServerObjects", "Le serveur crée des objets complexes" },
	{ "ServerObjectsInfo", "Selection pour les clients avec une connection lente" },

	{ "TestAS", "Test du serveur" },
	{ "TestASConnection", "Tester la connexion au serveur d'application" },
	{ "ServerNotActive", "Serveur non actif" },
	{ "ServerActive", "Serveur actif" },

	{ "TestDB", "Test de la base " },
	{ "TestDBConnection", "Test de connexion à la base" }
	};

	public Object[][] getContents()
	{
		return contents;
	}
}
--- NEW FILE: ALoginRes_fr.java ---
/******************************************************************************
 * The contents of this file are subject to the   Compiere License  Version 1.1
 * ("License"); You may not use this file except in compliance with the License
 * You may obtain a copy of the License at http://www.compiere.org/license.html
 * Software distributed under the License is distributed on an  "AS IS"  basis,
 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 * the specific language governing rights and limitations under the License.
 * The Original Code is                  Compiere  ERP & CRM  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
 * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
 * Contributor(s): ______________________________________.
 *****************************************************************************/
package org.compiere.apps;

import java.util.*;

/**
 *  Base Resource Bundle
 *
 * 	@author 	Franck Sebbah
 * 	@version 	$id$
 */
public final class ALoginRes_fr extends ListResourceBundle
{
	static final Object[][] contents = new String[][]{
	{ "Connection", "Connection" },
	{ "Defaults", "Défauts" },
	{ "Login", "Login" },
	{ "File", "Fichier" },
	{ "Exit", "Sortir" },
	{ "Help", "Aide" },
	{ "About", "A propos de" },
	{ "Host", "Serveur" },
	{ "Database", "Base de données" },
	{ "User", "Identifiant" },
	{ "EnterUser", "Entrer votre code identifiant" },
	{ "Password", "Mot de passe" },
	{ "EnterPassword", "Entrer le mot de passe" },
	{ "Language", "Langue" },
	{ "SelectLanguage", "Sélectionnez votre langue" },
	{ "Role", "Rôle" },
	{ "Client", "Client" },
	{ "Organization", "Organisation" },
	{ "Date", "Date" },
	{ "Warehouse", "Entrepôt" },
	{ "Printer", "Imprimante" },
	{ "Connected", "Connecté" },
	{ "NotConnected", "Non Connecté" },
	{ "DatabaseNotFound", "Base de données non trouvée" },
	{ "UserPwdError", "L'utilisateur n'a pas entré de mot de passe" },
	{ "RoleNotFound", "Rôle non trouvé" },
	{ "Authorized", "Autorisé" },
	{ "Ok", "Ok" },
	{ "Cancel", "Annuler" },
	{ "VersionConflict", "Version en conflit:" },
	{ "VersionInfo", "Serveur <> Client" },
	{ "PleaseUpgrade", "SVP, mettez à jour le programme" }
	};
	public Object[][] getContents()
	{
		return contents;
	}
}

[Compiere-cvslog] CVS: client Client.jpx.local,1.64,1.65

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/client
In directory usw-pr-cvs1:/tmp/cvs-serv31223

Modified Files:
	Client.jpx.local 
Log Message:
.

Index: Client.jpx.local
===================================================================
RCS file: /cvsroot/compiere/client/Client.jpx.local,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** Client.jpx.local	2002/01/08 06:18:54	1.64
--- Client.jpx.local	2002/01/09 07:00:54	1.65
***************
*** 14,18 ****
  debug.NoTracingClasses.8[0]=21 com.inprise.vbroker.*1  1 -1
  debug.NoTracingClasses.9[0]=9  com.sun.*1  1 -1
! history.files.active[0]=src/org/compiere/apps/AMenu.java
  history.files.open.1[0]=src/org/compiere/apps/ProcessCtl.java,F;304,8797
  history.files.open.10[0]=src/org/compiere/apps/AMenu.java,F;147,4787
--- 14,18 ----
  debug.NoTracingClasses.8[0]=21 com.inprise.vbroker.*1  1 -1
  debug.NoTracingClasses.9[0]=9  com.sun.*1  1 -1
! history.files.active[0]=src/org/compiere/apps/ConfirmPanel.java
  history.files.open.1[0]=src/org/compiere/apps/ProcessCtl.java,F;304,8797
  history.files.open.10[0]=src/org/compiere/apps/AMenu.java,F;147,4787
***************
*** 22,30 ****
  history.files.open.14[0]=src/org/compiere/apps/ALoginConnect.java,F;451,17754
  history.files.open.15[0]=src/org/compiere/apps/ALogin.java,F;668,25590
  history.files.open.2[0]=src/org/compiere/apps/SwingWorker.java,F;11,1815
  history.files.open.3[0]=src/org/compiere/apps/ASyncProcessBase.java,F;20,1597
  history.files.open.4[0]=src/org/compiere/apps/APanel.java,F;1508,42429
  history.files.open.5[0]=src/org/compiere/apps/AEnv.java,F;94,2960
! history.files.open.6[0]=src/org/compiere/apps/ConfirmPanel.java,F;0,557
  history.files.open.7[0]=src/org/compiere/apps/Preference.java,F;266,11653
  history.files.open.8[0]=src/org/compiere/grid/ed/Editor.java,F;36,2137
--- 22,31 ----
  history.files.open.14[0]=src/org/compiere/apps/ALoginConnect.java,F;451,17754
  history.files.open.15[0]=src/org/compiere/apps/ALogin.java,F;668,25590
+ history.files.open.16[0]=src/org/compiere/grid/ed/VBPartner.java,F;13,936
  history.files.open.2[0]=src/org/compiere/apps/SwingWorker.java,F;11,1815
  history.files.open.3[0]=src/org/compiere/apps/ASyncProcessBase.java,F;20,1597
  history.files.open.4[0]=src/org/compiere/apps/APanel.java,F;1508,42429
  history.files.open.5[0]=src/org/compiere/apps/AEnv.java,F;94,2960
! history.files.open.6[0]=src/org/compiere/apps/ConfirmPanel.java,F;449,13089
  history.files.open.7[0]=src/org/compiere/apps/Preference.java,F;266,11653
  history.files.open.8[0]=src/org/compiere/grid/ed/Editor.java,F;36,2137

[Compiere-cvslog] CVS: client/Src/org/compiere/apps ConfirmPanel.java,1.4,1.5

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/client/Src/org/compiere/apps
In directory usw-pr-cvs1:/tmp/cvs-serv31223/Src/org/compiere/apps

Modified Files:
	ConfirmPanel.java 
Log Message:
.

Index: ConfirmPanel.java
===================================================================
RCS file: /cvsroot/compiere/client/Src/org/compiere/apps/ConfirmPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConfirmPanel.java	2001/12/21 05:47:01	1.4
--- ConfirmPanel.java	2002/01/09 07:00:54	1.5
***************
*** 137,140 ****
--- 137,141 ----
  		okButton.setToolTipText(text);
  		okButton.setMargin(s_insets);
+ 		okButton.setDefaultCapable(true);
  		return okButton;
  	}	//	createOKButton
***************
*** 169,172 ****
--- 170,174 ----
  		cancelButton.setToolTipText(text);
  		cancelButton.setMargin(s_insets);
+ 		cancelButton.setDefaultCapable(false);
  		return cancelButton;
  	}	//	createCancelButton
***************
*** 236,239 ****
--- 238,242 ----
  		refreshButton.setToolTipText(text);
  		refreshButton.setMargin(s_insets);
+ 		refreshButton.setDefaultCapable(false);
  		return refreshButton;
  	}	//	createRefreshButton
***************
*** 268,271 ****
--- 271,275 ----
  		customizeButton.setToolTipText(text);
  		customizeButton.setMargin(s_insets);
+ 		customizeButton.setDefaultCapable(false);
  		return customizeButton;
  	}	//	createCustomizeButton
***************
*** 299,302 ****
--- 303,307 ----
  		historyButton.setToolTipText(text);
  		historyButton.setMargin(s_insets);
+ 		historyButton.setDefaultCapable(false);
  		return historyButton;
  	}	//	createHistoryButton
***************
*** 363,366 ****
--- 368,372 ----
  		processButton.setToolTipText(text);
  		processButton.setMargin(s_insets);
+ 		processButton.setDefaultCapable(false);
  		return processButton;
  	}	//	createProcessButton
***************
*** 409,412 ****
--- 415,419 ----
  		helpButton.setToolTipText(text);
  		helpButton.setMargin(s_insets);
+ 		helpButton.setDefaultCapable(false);
  		return helpButton;
  	}	//	createHelpButton
***************
*** 432,435 ****
--- 439,443 ----
  		exportButton.setToolTipText(text);
  		exportButton.setMargin(s_insets);
+ 		exportButton.setDefaultCapable(false);
  		return exportButton;
  	}	//	createExportButton

[Compiere-cvslog] CVS: base/src/org/compiere/swing CButton.java,NONE,1.1 CPanel.java,NONE,1.1

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/base/src/org/compiere/swing
In directory usw-pr-cvs1:/tmp/cvs-serv31114/src/org/compiere/swing

Added Files:
	CButton.java CPanel.java 
Log Message:
.

--- NEW FILE: CButton.java ---
/******************************************************************************
 * The contents of this file are subject to the   Compiere License  Version 1.1
 * ("License"); You may not use this file except in compliance with the License
 * You may obtain a copy of the License at http://www.compiere.org/license.html
 * Software distributed under the License is distributed on an  "AS IS"  basis,
 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 * the specific language governing rights and limitations under the License.
 * The Original Code is                  Compiere  ERP & CRM  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
 * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
 * Contributor(s): ______________________________________.
 *****************************************************************************/
package org.compiere.swing;

import java.awt.*;
import javax.swing.*;

import org.compiere.plaf.*;

/**
 *  Compiere Button supporting colored Background
 *
 *  @author     Jorg Janke
 *  @version    $Id: CButton.java,v 1.1 2002/01/09 07:00:29 jjanke Exp $
 */
public class CButton extends JButton
{
	/**
	 * Creates a button with no set text or icon.
	 */
	public CButton()
	{
		this (null, null);
	}

	/**
	 * Creates a button with an icon.
	 *
	 * @param icon  the Icon image to display on the button
	 */
	public CButton(Icon icon)
	{
		this (null, icon);
	}

	/**
	 * Creates a button with text.
	 *
	 * @param text  the text of the button
	 */
	public CButton(String text)
	{
		this (text, null);
	}

	/**
	 * Creates a button where properties are taken from the
	 * <code>Action</code> supplied.
	 *
	 * @param a the <code>Action</code> used to specify the new button
	 *
	 * @since 1.3
	 */
	public CButton (Action a)
	{
		super (a);
		setOpaque(false);
	}

	/**
	 * Creates a button with initial text and an icon.
	 *
	 * @param text  the text of the button
	 * @param icon  the Icon image to display on the button
	 */
	public CButton(String text, Icon icon)
	{
		super (text, icon);
		setOpaque(false);     //  is also default button behavior
	}

	/**
	 *
	 * @param bg
	 */
	public void setBackground(Color bg)
	{
		super.setBackground( bg);
		System.out.println(org.compiere.util.Log.getCaller(null)[1]);
		if (!org.compiere.util.Log.getCaller(null)[1].startsWith("javax"))
		{
			setOpaque(true);
			putClientProperty(CompierePLAF.BACKGROUND, new Boolean(true));
		}
	}
}   //  CButton
--- NEW FILE: CPanel.java ---
/******************************************************************************
 * The contents of this file are subject to the   Compiere License  Version 1.1
 * ("License"); You may not use this file except in compliance with the License
 * You may obtain a copy of the License at http://www.compiere.org/license.html
 * Software distributed under the License is distributed on an  "AS IS"  basis,
 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 * the specific language governing rights and limitations under the License.
 * The Original Code is                  Compiere  ERP & CRM  Business Solution
 * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
 * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
 * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
 * Contributor(s): ______________________________________.
 *****************************************************************************/
package org.compiere.swing;

import java.awt.*;
import javax.swing.*;
import java.net.*;

import org.compiere.plaf.*;

/**
 *  Compiere Panel supporting colored Backgrounds
 *
 *  @author     Jorg Janke
 *  @version    $Id: CPanel.java,v 1.1 2002/01/09 07:00:29 jjanke Exp $
 */
public class CPanel extends JPanel
{
	/**
	 * Creates a new CompierePanel with the specified layout manager
	 * and buffering strategy.
	 * @param layout  the LayoutManager to use
	 * @param isDoubleBuffered  a boolean, true for double-buffering, which
	 *        uses additional memory space to achieve fast, flicker-free updates
	 */
	public CPanel (LayoutManager layout, boolean isDoubleBuffered)
	{
		super (layout, isDoubleBuffered);
		init();
	}   //  CPanel

	/**
	 * Create a new buffered CPanel with the specified layout manager
	 * @param layout  the LayoutManager to use
	 */
	public CPanel (LayoutManager layout)
	{
		super (layout);
		init();
	}   //  CPanel

	/**
	 * Creates a new <code>CPanel</code> with <code>FlowLayout</code>
	 * and the specified buffering strategy.
	 * If <code>isDoubleBuffered</code> is true, the <code>CPanel</code>
	 * will use a double buffer.
	 * @param isDoubleBuffered  a boolean, true for double-buffering, which
	 *        uses additional memory space to achieve fast, flicker-free updates
	 */
	public CPanel (boolean isDoubleBuffered)
	{
		super (isDoubleBuffered);
		init();
	}   //  CPanel

	/**
	 * Creates a new <code>CPanel</code> with a double buffer and a flow layout.
	 * @param bc Initial Background Color
	 */
	public CPanel(CompiereColor bc)
	{
		super ();
		init();
		setBackground(bc);
	}   //  CPanel

	/**
	 * Creates a new <code>CPanel</code> with a double buffer and a flow layout.
	 */
	public CPanel()
	{
		super ();
		init();
	}   //  CPanel

	/**
	 *  Common Init, Not Opaque
	 */
	private void init()
	{
		setOpaque(false);
		putClientProperty(CompierePLAF.BACKGROUND, null);
	}   //  init

	/*************************************************************************/

	/**
	 *  Set Background - ignored by UI -
	 *  @param bg ignored
	 */
	public void setBackground (Color bg)
	{
		super.setBackground (bg);
		if (!org.compiere.util.Log.getCaller(null)[1].startsWith("javax"))
		{
		System.out.println(org.compiere.util.Log.getCaller(null)[1]);
			setBackground (new CompiereColor(bg));
		}
	}   //  setBackground

	/**
	 *  Set Background
	 *  @param bg CompiereColor for Background
	 */
	public void setBackground (CompiereColor bg)
	{
		if (bg == null)
			return;
		setOpaque(true);
		putClientProperty(CompierePLAF.BACKGROUND, bg);
		super.setBackground (bg.getFlatColor());
		//
		invalidate();
		validate();
		repaint();
	}   //  setBackground

	/**
	 *  Get Background
	 *  @return Color for Background
	 */
	public CompiereColor getBackgroundColor ()
	{
		try
		{
			return (CompiereColor)getClientProperty(CompierePLAF.BACKGROUND);
		}
		catch (Exception e)
		{
			System.err.println("CPanel - ClientProperty: " + e.getMessage());
		}
		return null;
	}   //  getBackgroundColor

	/*************************************************************************/


	/**
	 *  String representation
	 *  @return String representation
	 */
	public String toString()
	{
		StringBuffer sb = new StringBuffer ("CPanel [");
		sb.append(super.toString());
		CompiereColor bg = getBackgroundColor();
		if (bg != null)
			sb.append(bg.toString());
		sb.append("]");
		return sb.toString();
	}   //  toString

}   //  CPanel

[Compiere-cvslog] CVS: base Base.jpx.local,1.69,1.70 PLAF.jar,1.6,1.7

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/base
In directory usw-pr-cvs1:/tmp/cvs-serv31114

Modified Files:
	Base.jpx.local PLAF.jar 
Log Message:
.

Index: Base.jpx.local
===================================================================
RCS file: /cvsroot/compiere/base/Base.jpx.local,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** Base.jpx.local	2002/01/08 06:19:17	1.69
--- Base.jpx.local	2002/01/09 07:00:28	1.70
***************
*** 13,23 ****
  debug.NoTracingClasses.8[0]=21 com.inprise.vbroker.*1  1 -1
  debug.NoTracingClasses.9[0]=9  com.sun.*1  1 -1
! history.files.active[0]=src/org/compiere/util/Env.java
! history.files.open.1[0]=src/org/compiere/plaf/CompiereUtils.java,F;4,240
! history.files.open.2[0]=src/org/compiere/plaf/CompierePanelUI.java,F;99,3366
! history.files.open.3[0]=src/org/compiere/plaf/CompierePanel.java,F;85,0
! history.files.open.4[0]=src/org/compiere/plaf/CompiereColor.java,F;124,4667
! history.files.open.5[0]=src/org/compiere/plaf/CompierePLAFEditor.java,F;122,5519
! history.files.open.6[0]=src/org/compiere/util/Env.java,F;207,6949
  import.optimize.packageprefixgroupings.1[0]=<*>
  sys.Author[0]=Jorg Janke
--- 13,24 ----
  debug.NoTracingClasses.8[0]=21 com.inprise.vbroker.*1  1 -1
  debug.NoTracingClasses.9[0]=9  com.sun.*1  1 -1
! history.files.active[0]=src/org/compiere/plaf/CompiereColorEditor.java
! history.files.open.1[0]=src/org/compiere/swing/CButton.java,F;60,2382
! history.files.open.2[0]=src/org/compiere/swing/CPanel.java,F;88,3320
! history.files.open.3[0]=src/org/compiere/plaf/CompiereColorEditor.java,F;94,3227
! history.files.open.4[0]=src/org/compiere/plaf/CompiereThemeEditor.java,F;0,1335
! history.files.open.5[0]=src/org/compiere/plaf/CompiereButtonUI.java,F;15,1085
! history.files.open.6[0]=src/org/compiere/plaf/CompiereUtils.java,F;30,1376
! history.files.open.7[0]=src/org/compiere/util/Log.java,F;483,12635
  import.optimize.packageprefixgroupings.1[0]=<*>
  sys.Author[0]=Jorg Janke

Index: PLAF.jar
===================================================================
RCS file: /cvsroot/compiere/base/PLAF.jar,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
Binary files /tmp/cvsEfukY7 and /tmp/cvsMP10q7 differ

[Compiere-cvslog] CVS: base/src/org/compiere/plaf CompiereColorEditor.java,1.2,1.3 CompierePLAF.java,1.6,1.7 CompierePLAFEditor.java,1.5,1.6 CompierePanelUI.java,1.6,1.7 CompiereTabbedPaneUI.java,1.7,1.8 CompiereThemeEditor.java,1.5,1.6 CompiereUtils.java,1.5,1.6 CompierePanel.java,1.2,NONE

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/base/src/org/compiere/plaf
In directory usw-pr-cvs1:/tmp/cvs-serv31114/src/org/compiere/plaf

Modified Files:
	CompiereColorEditor.java CompierePLAF.java 
	CompierePLAFEditor.java CompierePanelUI.java 
	CompiereTabbedPaneUI.java CompiereThemeEditor.java 
	CompiereUtils.java 
Removed Files:
	CompierePanel.java 
Log Message:
.

Index: CompiereColorEditor.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/plaf/CompiereColorEditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompiereColorEditor.java	2002/01/08 05:55:36	1.2
--- CompiereColorEditor.java	2002/01/09 07:00:28	1.3
***************
*** 19,22 ****
--- 19,23 ----
  
  import org.compiere.util.*;
+ import org.compiere.swing.*;
  
  /**
***************
*** 91,95 ****
  		if (m_cc == null)
  			m_cc = CompierePanelUI.getBackground();
- 		updateFields();
  
  		bOK.addActionListener(this);
--- 92,95 ----
***************
*** 106,110 ****
  		widthField.addActionListener(this);
  		distanceField.addActionListener(this);
! 		//
  		CompierePLAF.showCenterScreen(this);
  	}   //  init
--- 106,112 ----
  		widthField.addActionListener(this);
  		distanceField.addActionListener(this);
! 
! 		updateFields();
! 		centerPanel.setBackground(m_cc);
  		CompierePLAF.showCenterScreen(this);
  	}   //  init
***************
*** 116,143 ****
  
  	//
! 	private JPanel northPanel = new JPanel();
! 	private JPanel southPanel = new JPanel();
! 	private JButton bOK = CompierePLAF.getOKButton();
! 	private JButton bCancel = CompierePLAF.getCancelButton();
  	private FlowLayout sothLayout = new FlowLayout();
  	private GridBagLayout northLayout = new GridBagLayout();
  	private JLabel typeLabel = new JLabel();
  	private JComboBox typeField = new JComboBox(CompiereColor.TYPES);
! 	private JButton gradientUpper = new JButton();
! 	private JButton gradientLower = new JButton();
  	private JLabel urlLabel = new JLabel();
  	private JTextField urlField = new JTextField(30);
  	private JLabel alphaLabel = new JLabel();
  	private JTextField alphaField = new JTextField();
! 	private JButton taintColor = new JButton();
! 	private JButton lineColor = new JButton();
! 	private JButton backColor = new JButton();
  	private JLabel widthLabel = new JLabel();
  	private JTextField widthField = new JTextField(10);
  	private JLabel distanceLabel = new JLabel();
  	private JTextField distanceField = new JTextField(10);
! 	private CompierePanel centerPanel = new CompierePanel();
  	private BorderLayout centerLayout = new BorderLayout();
! 	private JButton flatField = new JButton();
  
  	/**
--- 118,145 ----
  
  	//
! 	private CPanel northPanel = new CPanel();
! 	private CPanel southPanel = new CPanel();
! 	private CButton bOK = CompierePLAF.getOKButton();
! 	private CButton bCancel = CompierePLAF.getCancelButton();
  	private FlowLayout sothLayout = new FlowLayout();
  	private GridBagLayout northLayout = new GridBagLayout();
  	private JLabel typeLabel = new JLabel();
  	private JComboBox typeField = new JComboBox(CompiereColor.TYPES);
! 	private CButton gradientUpper = new CButton();
! 	private CButton gradientLower = new CButton();
  	private JLabel urlLabel = new JLabel();
  	private JTextField urlField = new JTextField(30);
  	private JLabel alphaLabel = new JLabel();
  	private JTextField alphaField = new JTextField();
! 	private CButton taintColor = new CButton();
! 	private CButton lineColor = new CButton();
! 	private CButton backColor = new CButton();
  	private JLabel widthLabel = new JLabel();
  	private JTextField widthField = new JTextField(10);
  	private JLabel distanceLabel = new JLabel();
  	private JTextField distanceField = new JTextField(10);
! 	private CPanel centerPanel = new CPanel();
  	private BorderLayout centerLayout = new BorderLayout();
! 	private CButton flatField = new CButton();
  
  	/**

Index: CompierePLAF.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/plaf/CompierePLAF.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CompierePLAF.java	2002/01/08 05:55:36	1.6
--- CompierePLAF.java	2002/01/09 07:00:28	1.7
***************
*** 22,25 ****
--- 22,26 ----
  import org.compiere.util.Ini;
  import org.compiere.util.ValueNamePair;
+ import org.compiere.swing.*;
  
  /**
***************
*** 32,35 ****
--- 33,39 ----
  public final class CompierePLAF
  {
+ 	/** Key of Client Property for CPanel and CButton   */
+ 	public static final String  BACKGROUND = "CompiereBackground";
+ 
  	/****** Background *******************************************************/
  
***************
*** 415,423 ****
  	 *  @return OK button
  	 */
! 	public static JButton getOKButton()
  	{
! 		JButton b = new JButton();
  		b.setIcon(new ImageIcon(CompierePLAF.class.getResource("Ok24.gif")));
  		b.setToolTipText (s_res.getString("OK"));
  		return b;
  	}   //  getOKButton
--- 419,428 ----
  	 *  @return OK button
  	 */
! 	public static CButton getOKButton()
  	{
! 		CButton b = new CButton();
  		b.setIcon(new ImageIcon(CompierePLAF.class.getResource("Ok24.gif")));
  		b.setToolTipText (s_res.getString("OK"));
+ 		b.setDefaultCapable(true);
  		return b;
  	}   //  getOKButton
***************
*** 427,435 ****
  	 *  @return Cancel button
  	 */
! 	public static JButton getCancelButton()
  	{
! 		JButton b = new JButton();
  		b.setIcon(new ImageIcon(CompierePLAF.class.getResource("Cancel24.gif")));
  		b.setToolTipText (s_res.getString("Cancel"));
  		return b;
  	}   //  getCancelButton
--- 432,441 ----
  	 *  @return Cancel button
  	 */
! 	public static CButton getCancelButton()
  	{
! 		CButton b = new CButton();
  		b.setIcon(new ImageIcon(CompierePLAF.class.getResource("Cancel24.gif")));
  		b.setToolTipText (s_res.getString("Cancel"));
+ 		b.setDefaultCapable(false);
  		return b;
  	}   //  getCancelButton

Index: CompierePLAFEditor.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/plaf/CompierePLAFEditor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CompierePLAFEditor.java	2002/01/08 05:55:36	1.5
--- CompierePLAFEditor.java	2002/01/09 07:00:28	1.6
***************
*** 25,28 ****
--- 25,29 ----
  import org.compiere.util.Ini;
  import org.compiere.util.ValueNamePair;
+ import org.compiere.swing.*;
  
  /**
***************
*** 114,120 ****
  		{"-l0-", "-l1-", "-l2-", "-l3-", "-lO-", "-ll-"}};
  
! 	private JPanel northPanel = new JPanel();
! 	private JPanel southPanel = new JPanel();
! 	private JButton bOK = CompierePLAF.getOKButton();
  	private GridBagLayout northLayout = new GridBagLayout();
  	private JLabel lfLabel = new JLabel();
--- 115,121 ----
  		{"-l0-", "-l1-", "-l2-", "-l3-", "-lO-", "-ll-"}};
  
! 	private CPanel northPanel = new CPanel();
! 	private CPanel southPanel = new CPanel();
! 	private CButton bOK = CompierePLAF.getOKButton();
  	private GridBagLayout northLayout = new GridBagLayout();
  	private JLabel lfLabel = new JLabel();
***************
*** 122,138 ****
  	private JLabel themeLabel = new JLabel();
  	private JComboBox themeField = new JComboBox(CompierePLAF.getThemes());
! 	private JButton cButton = new JButton();
  	private FlowLayout southLayout = new FlowLayout();
! 	private JButton bCancel = CompierePLAF.getCancelButton();
! 	private JButton rButton = new JButton();
  	private JTabbedPane example = new JTabbedPane();
! 	private JPanel jPanel1 = new JPanel();
  	private TitledBorder exampleBorder;
! 	private JPanel jPanel2 = new JPanel();
  	private JLabel jLabel1 = new JLabel();
  	private JTextField jTextField1 = new JTextField();
  	private JCheckBox jCheckBox1 = new JCheckBox();
  	private JRadioButton jRadioButton1 = new JRadioButton();
! 	private JButton jButton1 = new JButton();
  	private JToggleButton jToggleButton1 = new JToggleButton();
  	private JComboBox jComboBox1 = new JComboBox(s_columns);
--- 123,139 ----
  	private JLabel themeLabel = new JLabel();
  	private JComboBox themeField = new JComboBox(CompierePLAF.getThemes());
! 	private CButton cButton = new CButton();
  	private FlowLayout southLayout = new FlowLayout();
! 	private CButton bCancel = CompierePLAF.getCancelButton();
! 	private CButton rButton = new CButton();
  	private JTabbedPane example = new JTabbedPane();
! 	private CPanel jPanel1 = new CPanel();
  	private TitledBorder exampleBorder;
! 	private CPanel jPanel2 = new CPanel();
  	private JLabel jLabel1 = new JLabel();
  	private JTextField jTextField1 = new JTextField();
  	private JCheckBox jCheckBox1 = new JCheckBox();
  	private JRadioButton jRadioButton1 = new JRadioButton();
! 	private CButton jButton1 = new CButton();
  	private JToggleButton jToggleButton1 = new JToggleButton();
  	private JComboBox jComboBox1 = new JComboBox(s_columns);
***************
*** 149,161 ****
  	private JTable jTable1 = new JTable(s_data, s_columns);
  	private GridBagLayout gridBagLayout1 = new GridBagLayout();
! 	private JButton bSetColor = new JButton();
! 	private CompierePanel jPanel3 = new CompierePanel(new CompiereColor(Color.blue));
! 	private CompierePanel jPanel4 = new CompierePanel(new CompiereColor(Color.red, Color.yellow));
! 	private CompierePanel jPanel5 = new CompierePanel(new CompiereColor(CompiereColor.class.getResource("Cancel24.gif"), Color.lightGray, 0.7f));
! 	private CompierePanel jPanel6 = new CompierePanel(new CompiereColor(Color.yellow, Color.green, 1, 5));
! 	private JButton jButton2 = new JButton();
! 	private JButton jButton3 = new JButton();
! 	private JButton jButton4 = new JButton();
! 	private JButton jButton5 = new JButton();
  	private JComboBox jComboBox2 = new JComboBox(new Integer[]
  		{new Integer(JTabbedPane.TOP),new Integer(JTabbedPane.LEFT),new Integer(JTabbedPane.BOTTOM),new Integer(JTabbedPane.RIGHT)});
--- 150,162 ----
  	private JTable jTable1 = new JTable(s_data, s_columns);
  	private GridBagLayout gridBagLayout1 = new GridBagLayout();
! 	private CButton bSetColor = new CButton();
! 	private CPanel jPanel3 = new CPanel(new CompiereColor(Color.blue));
! 	private CPanel jPanel4 = new CPanel(new CompiereColor(Color.red, Color.yellow));
! 	private CPanel jPanel5 = new CPanel(new CompiereColor(CompiereColor.class.getResource("Cancel24.gif"), Color.lightGray, 0.7f));
! 	private CPanel jPanel6 = new CPanel(new CompiereColor(Color.yellow, Color.green, 1, 5));
! 	private CButton jButton2 = new CButton();
! 	private CButton jButton3 = new CButton();
! 	private CButton jButton4 = new CButton();
! 	private CButton jButton5 = new CButton();
  	private JComboBox jComboBox2 = new JComboBox(new Integer[]
  		{new Integer(JTabbedPane.TOP),new Integer(JTabbedPane.LEFT),new Integer(JTabbedPane.BOTTOM),new Integer(JTabbedPane.RIGHT)});

Index: CompierePanelUI.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/plaf/CompierePanelUI.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CompierePanelUI.java	2002/01/08 05:55:36	1.6
--- CompierePanelUI.java	2002/01/09 07:00:28	1.7
***************
*** 70,76 ****
  	private static CompiereColor    s_default = new CompiereColor();
  
- 	/** Key of Client Property  */
- 	public static final String  BACKGROUND = "CompiereBackground";
- 
  	/**
  	 *  Update -
--- 70,73 ----
***************
*** 102,111 ****
  	protected static void updateIt (Graphics g, JComponent c)
  	{
! 		System.out.println("Panel.updateIt: " + c.toString());
  		Graphics2D g2 = (Graphics2D)g;
  		int height = c.getHeight();
  		int width = c.getWidth();
  		//  Get CompiereColor
! 		CompiereColor bg = (CompiereColor)c.getClientProperty(BACKGROUND);
  		if (bg == null)
  		{
--- 99,116 ----
  	protected static void updateIt (Graphics g, JComponent c)
  	{
! 	//	System.out.println("Panel.updateIt: " + c.toString());
  		Graphics2D g2 = (Graphics2D)g;
  		int height = c.getHeight();
  		int width = c.getWidth();
  		//  Get CompiereColor
! 		CompiereColor bg = null;
! 		try
! 		{
! 			bg = (CompiereColor)c.getClientProperty(CompierePLAF.BACKGROUND);
! 		}
! 		catch (Exception e)
! 		{
! 			System.err.println("CompierePanelUI - ClientProperty: " + e.getMessage());
! 		}
  		if (bg == null)
  		{

Index: CompiereTabbedPaneUI.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/plaf/CompiereTabbedPaneUI.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CompiereTabbedPaneUI.java	2002/01/08 05:55:36	1.7
--- CompiereTabbedPaneUI.java	2002/01/09 07:00:28	1.8
***************
*** 153,157 ****
  		{
  			JPanel jp = (JPanel)comp;
! 			bg = (CompiereColor)jp.getClientProperty(CompierePanelUI.BACKGROUND);
  		}
  		if (tabPlacement == BOTTOM && bg != null && bg.isGradient())
--- 153,164 ----
  		{
  			JPanel jp = (JPanel)comp;
! 			try
! 			{
! 				bg = (CompiereColor)jp.getClientProperty(CompierePLAF.BACKGROUND);
! 			}
! 			catch (Exception e)
! 			{
! 				System.err.println("CompiereTabbedPaneUI - ClientProperty: " + e.getMessage());
! 			}
  		}
  		if (tabPlacement == BOTTOM && bg != null && bg.isGradient())
***************
*** 208,213 ****
  			g2D.setPaint(bg.getLineColor());
  			g2D.setStroke(new BasicStroke(bg.getLineWidth()));
! 			for (int yy = y; yy < y+h; yy += bg.getLineDistance())
! 				g2D.drawLine(x, yy, x+w, yy);
  		}
  
--- 215,234 ----
  			g2D.setPaint(bg.getLineColor());
  			g2D.setStroke(new BasicStroke(bg.getLineWidth()));
! 			for (int yy = y+1; yy < y+h; yy += bg.getLineDistance())
! 			{
! 				if (yy < y+6)
! 				{
! 					int d = 6-(yy-y);
! 					if (tabPlacement == TOP || tabPlacement == LEFT)    //  top left corner
! 						g2D.drawLine(x+1+d, yy, x+w-1, yy);
! 					else if (tabPlacement == RIGHT)                     //  top right corner
! 						g2D.drawLine(x+1, yy, x+w-1-d, yy);
! 				}
! 				else if (yy > y+h-6 && tabPlacement == BOTTOM)          //  bottom left corner
! 					g2D.drawLine(x+1+(yy-(y+h-6)), yy, x+w-1, yy);
! 				else
! 					g2D.drawLine(x+1, yy, x+w-1, yy);
! 				System.out.println("yy=" + yy + ", y=" + y + ", h=" + h);
! 			}
  		}
  
***************
*** 312,316 ****
  		{
  			JPanel jp = (JPanel)comp;
! 			CompiereColor bg = (CompiereColor)jp.getClientProperty(CompierePanelUI.BACKGROUND);
  			if (bg != null && bg.isGradient())
  				g2D.setPaint(new GradientPaint(0,0, bg.getGradientUpperColor(),
--- 333,345 ----
  		{
  			JPanel jp = (JPanel)comp;
! 			CompiereColor bg = null;
! 			try
! 			{
! 				bg = (CompiereColor)jp.getClientProperty(CompierePLAF.BACKGROUND);
! 			}
! 			catch (Exception e)
! 			{
! 				System.err.println("CompiereTabbedPaneUI - ClientProperty: " + e.getMessage());
! 			}
  			if (bg != null && bg.isGradient())
  				g2D.setPaint(new GradientPaint(0,0, bg.getGradientUpperColor(),

Index: CompiereThemeEditor.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/plaf/CompiereThemeEditor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CompiereThemeEditor.java	2002/01/07 06:26:55	1.5
--- CompiereThemeEditor.java	2002/01/09 07:00:28	1.6
***************
*** 26,29 ****
--- 26,30 ----
  
  import org.compiere.util.Ini;
+ import org.compiere.swing.*;
  
  /**
***************
*** 60,96 ****
  	static ResourceBundle   s_res = ResourceBundle.getBundle("org.compiere.plaf.Res");
  
! 	private JButton primary1 = new JButton();
! 	private JButton primary2 = new JButton();
! 	private JButton primary3 = new JButton();
! 	private JButton secondary1 = new JButton();
! 	private JButton secondary2 = new JButton();
! 	private JButton secondary3 = new JButton();
! 	private JButton controlFont = new JButton();
! 	private JButton systemFont = new JButton();
! 	private JButton userFont = new JButton();
! 	private JButton smallFont = new JButton();
! 	private JButton mandatory = new JButton();
! 	private JButton error = new JButton();
! 	private JButton windowFont = new JButton();
! 	private JButton menuFont = new JButton();
! 	private JButton white = new JButton();
! 	private JButton black = new JButton();
! 	private JPanel confirmPanel = new JPanel();
  
! 	private JButton inactive = new JButton();
! 	private JButton txt_ok = new JButton();
! 	private JButton txt_error = new JButton();
! 	private JButton bCancel = CompierePLAF.getCancelButton();
! 	private JButton bOK = CompierePLAF.getOKButton();
  	private FlowLayout confirmLayout = new FlowLayout();
! 	private JPanel centerPanel = new JPanel();
! 	private JPanel metalColorPanel = new JPanel();
  	private BorderLayout centerLayout = new BorderLayout();
! 	private JPanel compiereColorPanel = new JPanel();
  	private TitledBorder metalColorBorder;
  	private TitledBorder compiereColorBorder;
  	private GridLayout metalColorLayout = new GridLayout();
  	private GridLayout compiereColorLayout = new GridLayout();
! 	private JPanel fontPanel = new JPanel();
  	private GridLayout fontLayout = new GridLayout();
  	private TitledBorder fontBorder;
--- 61,97 ----
  	static ResourceBundle   s_res = ResourceBundle.getBundle("org.compiere.plaf.Res");
  
! 	private CButton primary1 = new CButton();
! 	private CButton primary2 = new CButton();
! 	private CButton primary3 = new CButton();
! 	private CButton secondary1 = new CButton();
! 	private CButton secondary2 = new CButton();
! 	private CButton secondary3 = new CButton();
! 	private CButton controlFont = new CButton();
! 	private CButton systemFont = new CButton();
! 	private CButton userFont = new CButton();
! 	private CButton smallFont = new CButton();
! 	private CButton mandatory = new CButton();
! 	private CButton error = new CButton();
! 	private CButton windowFont = new CButton();
! 	private CButton menuFont = new CButton();
! 	private CButton white = new CButton();
! 	private CButton black = new CButton();
! 	private CPanel confirmPanel = new CPanel();
  
! 	private CButton inactive = new CButton();
! 	private CButton txt_ok = new CButton();
! 	private CButton txt_error = new CButton();
! 	private CButton bCancel = CompierePLAF.getCancelButton();
! 	private CButton bOK = CompierePLAF.getOKButton();
  	private FlowLayout confirmLayout = new FlowLayout();
! 	private CPanel centerPanel = new CPanel();
! 	private CPanel metalColorPanel = new CPanel();
  	private BorderLayout centerLayout = new BorderLayout();
! 	private CPanel compiereColorPanel = new CPanel();
  	private TitledBorder metalColorBorder;
  	private TitledBorder compiereColorBorder;
  	private GridLayout metalColorLayout = new GridLayout();
  	private GridLayout compiereColorLayout = new GridLayout();
! 	private CPanel fontPanel = new CPanel();
  	private GridLayout fontLayout = new GridLayout();
  	private TitledBorder fontBorder;

Index: CompiereUtils.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/plaf/CompiereUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CompiereUtils.java	2002/01/08 05:55:36	1.5
--- CompiereUtils.java	2002/01/09 07:00:28	1.6
***************
*** 32,36 ****
  {
  	/**
! 	 *  Fill Background with flat Color of JPanel !
  	 *  (Ususlly called from update methods)
  	 *
--- 32,36 ----
  {
  	/**
! 	 *  Fill Background with flat Color of the explicitly set or the one of its JPanel
  	 *  (Ususlly called from update methods)
  	 *
***************
*** 42,54 ****
  	{
  		Paint paint = c.getBackground();
! 		Container container = c.getParent();
! 		while (container != null)
  		{
! 			if (container instanceof JPanel)
  			{
! 				paint = container.getBackground();
! 				break;
  			}
- 			container = container.getParent();
  		}
  	//	System.out.println("Fill: " + c.getClass() + " - " + paint);
--- 42,57 ----
  	{
  		Paint paint = c.getBackground();
! 		if (c.getClientProperty(CompierePLAF.BACKGROUND) == null)
  		{
! 			Container container = c.getParent();
! 			while (container != null)
  			{
! 				if (container instanceof JPanel)
! 				{
! 					paint = container.getBackground();
! 					break;
! 				}
! 				container = container.getParent();
  			}
  		}
  	//	System.out.println("Fill: " + c.getClass() + " - " + paint);

--- CompierePanel.java DELETED ---

[Compiere-cvslog] CVS: base/src/org/compiere/util Log.java,1.14,1.15 Secure.java,1.1,1.2

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/base/src/org/compiere/util
In directory usw-pr-cvs1:/tmp/cvs-serv31114/src/org/compiere/util

Modified Files:
	Log.java Secure.java 
Log Message:
.

Index: Log.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/util/Log.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Log.java	2002/01/07 06:26:55	1.14
--- Log.java	2002/01/09 07:00:29	1.15
***************
*** 506,510 ****
--- 506,512 ----
  				;
  			else
+ 			{
  				list.add(token);
+ 			}
  		}
  		String[] retValue = new String[list.size()];

Index: Secure.java
===================================================================
RCS file: /cvsroot/compiere/base/src/org/compiere/util/Secure.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Secure.java	2002/01/07 06:26:55	1.1
--- Secure.java	2002/01/09 07:00:29	1.2
***************
*** 14,17 ****
--- 14,19 ----
  package org.compiere.util;
  
+ import java.security.*;
+ 
  /**
   *  Security Services (Open Source - i.e. none)
***************
*** 64,67 ****
--- 66,120 ----
  		return retValue;
  	}	//	hash
+ 
+ 	/**
+ 	 *  Convert Message to Digest
+ 	 *  JavaScript version see - http://pajhome.org.uk/crypt/md5/index.html
+ 	 *
+ 	 *  @param message
+ 	 *  @return HexString of message
+ 	 */
+ 	public static String getDigest (String message)
+ 	{
+ 		MessageDigest md = null;
+ 		try
+ 		{
+ 			md = MessageDigest.getInstance("MD5");
+ 		}
+ 		catch (NoSuchAlgorithmException nsae)
+ 		{
+ 			nsae.printStackTrace();
+ 		}
+ 		byte[] input = message.getBytes();
+ 		md.update(input);
+ 		byte[] output = md.digest();
+ 		md.reset();
+ 		return convertToHexString(output);
+ 	}   //  getDigest
+ 
+ 	/**
+ 	 *  Convert Byte Array to Hex String
+ 	 *  @param bytes
+ 	 *  @return HexString
+ 	 */
+ 	static private String convertToHexString (byte[] bytes)
+ 	{
+ 		int size = bytes.length;
+ 		StringBuffer buffer = new StringBuffer(size*2);
+ 		for(int i=0; i<size; i++)
+ 		{
+ 			// convert byte to an int
+ 			int x = (int)bytes[i];
+ 			// account for int being a signed type and byte being unsigned
+ 			if (x < 0)
+ 				x += 256;
+ 			// this outputs capitalised hex, ie: "0A" rather than "0a"
+ 			String tmp = Integer.toHexString(x);
+ 			// pad out "1" to "01" etc.
+ 			if (tmp.length() == 1)
+ 				buffer.append("0");
+ 			buffer.append(tmp);
+ 		}
+ 		return buffer.toString();
+ 	}   //  convertToHexString
  
  }   //  Secure

[Compiere-cvslog] CVS: base/src/org/compiere/swing - New directory

[Jorg Janke <jjanke@us...>]

Update of /cvsroot/compiere/base/src/org/compiere/swing
In directory usw-pr-cvs1:/tmp/cvs-serv30907/swing

Log Message:
Directory /cvsroot/compiere/base/src/org/compiere/swing added to the repository