midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* refactor Info_Column and ColumnInfo classes

This commit is contained in:
teo_sarca 2008-08-19 07:19:09 +00:00
parent 4513b48f50
commit 3c3075f1be
2 changed files with 30 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
client/src/org/compiere/apps/search/Info_Column.java
View File

@ -16,13 +16,17 @@
*****************************************************************************/ *****************************************************************************/
package org.compiere.apps.search; package org.compiere.apps.search;
import org.compiere.minigrid.ColumnInfo;
/** /**
* Info Column Details * Info Column Details
* *
* @author Jorg Janke * @author Jorg Janke
* @version $Id: Info_Column.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $ * @version $Id: Info_Column.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
*
* NOTE: Use {@link org.compiere.minigrid.ColumnInfo} instead
*/ */
public class Info_Column public class Info_Column extends ColumnInfo
{ {
/** /**
* Create Info Column (r/o and not color column) * Create Info Column (r/o and not color column)
@ -31,9 +35,9 @@ public class Info_Column
* @param colSQL SQL select code for column * @param colSQL SQL select code for column
* @param colClass class of column - determines display * @param colClass class of column - determines display
*/ */
public Info_Column (String colHeader, String colSQL, Class colClass) public Info_Column (String colHeader, String colSQL, Class<?> colClass)
{ {
this(colHeader, colSQL, colClass, true, false, null); super(colHeader, colSQL, colClass);
} // Info_Column } // Info_Column
/** /**
@ -44,9 +48,9 @@ public class Info_Column
* @param colClass class of column - determines display * @param colClass class of column - determines display
* @param IDcolSQL SQL select for the ID of the for the displayed column (KeyNamePair) * @param IDcolSQL SQL select for the ID of the for the displayed column (KeyNamePair)
*/ */
public Info_Column (String colHeader, String colSQL, Class colClass, String IDcolSQL) public Info_Column (String colHeader, String colSQL, Class<?> colClass, String IDcolSQL)
{ {
this(colHeader, colSQL, colClass, true, false, IDcolSQL); super(colHeader, colSQL, colClass, true, false, IDcolSQL);
} // Info_Column } // Info_Column
/** /**
@ -58,9 +62,9 @@ public class Info_Column
* @param readOnly column is read only * @param readOnly column is read only
* @author ashley * @author ashley
*/ */
public Info_Column (String colHeader, String colSQL, Class colClass, boolean readOnly) public Info_Column (String colHeader, String colSQL, Class<?> colClass, boolean readOnly)
{ {
this(colHeader, colSQL, colClass, readOnly, false, null); super(colHeader, colSQL, colClass, readOnly, false, null);
} // Info_Column } // Info_Column
/** /**
@ -73,87 +77,21 @@ public class Info_Column
* @param colorColumn if true, value of column determines foreground color * @param colorColumn if true, value of column determines foreground color
* @param IDcolSQL SQL select for the ID of the for the displayed column * @param IDcolSQL SQL select for the ID of the for the displayed column
*/ */
public Info_Column (String colHeader, String colSQL, Class colClass, public Info_Column (String colHeader, String colSQL, Class<?> colClass,
boolean readOnly, boolean colorColumn, String IDcolSQL) boolean readOnly, boolean colorColumn, String IDcolSQL)
{ {
setColHeader(colHeader); super(colHeader, colSQL, colClass, readOnly, colorColumn, IDcolSQL);
setColSQL(colSQL);
setColClass(colClass);
setReadOnly(readOnly);
setColorColumn(colorColumn);
setIDcolSQL(IDcolSQL);
} // Info_Column } // Info_Column
private String m_colHeader;
private String m_colSQL;
private Class m_colClass;
private boolean m_readOnly;
private boolean m_colorColumn;
private String m_IDcolSQL = "";
public Class getColClass()
{
return m_colClass;
}
public String getColHeader()
{
return m_colHeader;
}
public String getColSQL()
{
return m_colSQL;
}
public boolean isReadOnly()
{
return m_readOnly;
}
public void setColClass(Class colClass)
{
m_colClass = colClass;
}
public void setColHeader(String colHeader)
{
m_colHeader = colHeader;
if (colHeader != null)
{
int index = colHeader.indexOf('&');
if (index != -1)
m_colHeader = colHeader.substring(0, index) + colHeader.substring(index+1);
}
}
public void setColSQL(String colSQL)
{
m_colSQL = colSQL;
}
public void setReadOnly(boolean readOnly)
{
m_readOnly = readOnly;
}
public void setColorColumn(boolean colorColumn)
{
m_colorColumn = colorColumn;
}
public boolean isColorColumn()
{
return m_colorColumn;
}
/**
* Add ID column SQL for the displayed column
* The Class for this should be KeyNamePair
*/
public void setIDcolSQL(String IDcolSQL) public void setIDcolSQL(String IDcolSQL)
{ {
m_IDcolSQL = IDcolSQL; super.setKeyPairColSQL(IDcolSQL);
if (m_IDcolSQL == null)
m_IDcolSQL = "";
} }
public String getIDcolSQL() public String getIDcolSQL()
{ {
return m_IDcolSQL; return super.getKeyPairColSQL();
} }
public boolean isIDcol() public boolean isIDcol()
{ {
return m_IDcolSQL.length() > 0; return super.isKeyPairCol();
} }
} // infoColumn } // infoColumn

18
client/src/org/compiere/minigrid/ColumnInfo.java
View File

@ -31,7 +31,7 @@ public class ColumnInfo
* @param colSQL SQL select code for column * @param colSQL SQL select code for column
* @param colClass class of column - determines display * @param colClass class of column - determines display
*/ */
public ColumnInfo (String colHeader, String colSQL, Class colClass) public ColumnInfo (String colHeader, String colSQL, Class<?> colClass)
{ {
this(colHeader, colSQL, colClass, true, false, null); this(colHeader, colSQL, colClass, true, false, null);
} // ColumnInfo } // ColumnInfo
@ -44,7 +44,7 @@ public class ColumnInfo
* @param colClass class of column - determines display * @param colClass class of column - determines display
* @param keyPairColSQL SQL select for the ID of the for the displayed column * @param keyPairColSQL SQL select for the ID of the for the displayed column
*/ */
public ColumnInfo (String colHeader, String colSQL, Class colClass, String keyPairColSQL) public ColumnInfo (String colHeader, String colSQL, Class<?> colClass, String keyPairColSQL)
{ {
this(colHeader, colSQL, colClass, true, false, keyPairColSQL); this(colHeader, colSQL, colClass, true, false, keyPairColSQL);
} // ColumnInfo } // ColumnInfo
@ -59,7 +59,7 @@ public class ColumnInfo
* @param colorColumn if true, value of column determines foreground color * @param colorColumn if true, value of column determines foreground color
* @param keyPairColSQL SQL select for the ID of the for the displayed column * @param keyPairColSQL SQL select for the ID of the for the displayed column
*/ */
public ColumnInfo (String colHeader, String colSQL, Class colClass, public ColumnInfo (String colHeader, String colSQL, Class<?> colClass,
boolean readOnly, boolean colorColumn, String keyPairColSQL) boolean readOnly, boolean colorColumn, String keyPairColSQL)
{ {
setColHeader(colHeader); setColHeader(colHeader);
@ -73,7 +73,7 @@ public class ColumnInfo
private String m_colHeader; private String m_colHeader;
private String m_colSQL; private String m_colSQL;
private Class m_colClass; private Class<?> m_colClass;
private boolean m_readOnly; private boolean m_readOnly;
private boolean m_colorColumn; private boolean m_colorColumn;
private String m_keyPairColSQL = ""; private String m_keyPairColSQL = "";
@ -82,7 +82,7 @@ public class ColumnInfo
* Get Col Class * Get Col Class
* @return class * @return class
*/ */
public Class getColClass() public Class<?> getColClass()
{ {
return m_colClass; return m_colClass;
} }
@ -114,7 +114,7 @@ public class ColumnInfo
* Set ColClass * Set ColClass
* @param colClass class * @param colClass class
*/ */
public void setColClass(Class colClass) public void setColClass(Class<?> colClass)
{ {
m_colClass = colClass; m_colClass = colClass;
} }
@ -125,6 +125,12 @@ public class ColumnInfo
public void setColHeader(String colHeader) public void setColHeader(String colHeader)
{ {
m_colHeader = colHeader; m_colHeader = colHeader;
if (colHeader != null)
{
int index = colHeader.indexOf('&');
if (index != -1)
m_colHeader = colHeader.substring(0, index) + colHeader.substring(index+1);
}
} }
/** /**
* Set Col SQL * Set Col SQL