From 8393b8113b5978c64188b917b0c9bf41d93c7c6b Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Wed, 30 Jan 2008 04:31:37 +0000 Subject: [PATCH] * [ 1876642 ] Add Collapsed by Default to Field Group * minor - show java.io.tmpdir value on preference dialog. --- base/src/org/compiere/model/GridField.java | 16 +++++++++++++ base/src/org/compiere/model/GridFieldVO.java | 5 ++++ .../org/compiere/model/I_AD_FieldGroup.java | 13 ++++++++++ .../org/compiere/model/X_AD_FieldGroup.java | 24 +++++++++++++++++++ base/src/org/compiere/util/CLogMgt.java | 1 + 5 files changed, 59 insertions(+) diff --git a/base/src/org/compiere/model/GridField.java b/base/src/org/compiere/model/GridField.java index c2870839d7..bbef691af8 100644 --- a/base/src/org/compiere/model/GridField.java +++ b/base/src/org/compiere/model/GridField.java @@ -1614,4 +1614,20 @@ public class GridField { return m_vo.Included_Tab_ID; } + + /** + * Set the default state of collapse field group type + * @param flag + */ + public void setIsCollapsedByDefault(boolean flag) { + m_vo.IsCollapsedByDefault = flag; + } + + /** + * Get the default state of collapse field group type + * @param collapseDefaultState + */ + public boolean getIsCollapsedByDefault() { + return m_vo.IsCollapsedByDefault; + } } // MField diff --git a/base/src/org/compiere/model/GridFieldVO.java b/base/src/org/compiere/model/GridFieldVO.java index d8cbc0960d..ae7e6ee42d 100644 --- a/base/src/org/compiere/model/GridFieldVO.java +++ b/base/src/org/compiere/model/GridFieldVO.java @@ -160,6 +160,9 @@ public class GridFieldVO implements Serializable //Feature Request FR [ 1757088 ] else if (columnName.equalsIgnoreCase("Included_Tab_ID")) vo.Included_Tab_ID = rs.getInt(i); + // Collapse Default State + else if (columnName.equalsIgnoreCase("IsCollapsedByDefault")) + vo.IsCollapsedByDefault = "Y".equals(rs.getString(i)); } if (vo.Header == null) vo.Header = vo.ColumnName; @@ -483,6 +486,8 @@ public class GridFieldVO implements Serializable //* Feature Request FR [ 1757088 ] public int Included_Tab_ID = 0; + /** Collapse By Default * */ + public boolean IsCollapsedByDefault = false; /** * Set Context including contained elements diff --git a/base/src/org/compiere/model/I_AD_FieldGroup.java b/base/src/org/compiere/model/I_AD_FieldGroup.java index 0a7f2ea352..afb935941e 100644 --- a/base/src/org/compiere/model/I_AD_FieldGroup.java +++ b/base/src/org/compiere/model/I_AD_FieldGroup.java @@ -93,6 +93,19 @@ public interface I_AD_FieldGroup /** Get Field Group Type */ public String getFieldGroupType(); + /** Column name IsCollapsedByDefault */ + public static final String COLUMNNAME_IsCollapsedByDefault = "IsCollapsedByDefault"; + + /** Set Collapsed By Default. + * Flag to set the initial state of collapsible field group. + */ + public void setIsCollapsedByDefault (boolean IsCollapsedByDefault); + + /** Get Collapsed By Default. + * Flag to set the initial state of collapsible field group. + */ + public boolean isCollapsedByDefault(); + /** Column name Name */ public static final String COLUMNNAME_Name = "Name"; diff --git a/base/src/org/compiere/model/X_AD_FieldGroup.java b/base/src/org/compiere/model/X_AD_FieldGroup.java index 97bb25d24f..de3f3c6766 100644 --- a/base/src/org/compiere/model/X_AD_FieldGroup.java +++ b/base/src/org/compiere/model/X_AD_FieldGroup.java @@ -149,6 +149,30 @@ public class X_AD_FieldGroup extends PO implements I_AD_FieldGroup, I_Persistent return (String)get_Value(COLUMNNAME_FieldGroupType); } + /** Set Collapsed By Default. + @param IsCollapsedByDefault + Flag to set the initial state of collapsible field group. + */ + public void setIsCollapsedByDefault (boolean IsCollapsedByDefault) + { + set_Value (COLUMNNAME_IsCollapsedByDefault, Boolean.valueOf(IsCollapsedByDefault)); + } + + /** Get Collapsed By Default. + @return Flag to set the initial state of collapsible field group. + */ + public boolean isCollapsedByDefault () + { + Object oo = get_Value(COLUMNNAME_IsCollapsedByDefault); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + /** Set Name. @param Name Alphanumeric identifier of the entity diff --git a/base/src/org/compiere/util/CLogMgt.java b/base/src/org/compiere/util/CLogMgt.java index 4040f513cd..04d00d5f34 100644 --- a/base/src/org/compiere/util/CLogMgt.java +++ b/base/src/org/compiere/util/CLogMgt.java @@ -508,6 +508,7 @@ public class CLogMgt sb.append("BaseLanguage = ").append(Env.isBaseLanguage(Env.getCtx(), "AD_Window")) .append("/").append(Env.isBaseLanguage(Env.getCtx(), "C_UOM")).append(NL); sb.append(Adempiere.getJavaInfo()).append(NL); + sb.append("java.io.tmpdir="+System.getProperty("java.io.tmpdir")); sb.append(Adempiere.getOSInfo()); // return sb;