[cvs] eforum commit by ppilgrim: Added banner header text font style
JCorporate Ltd
jcorp at jcorporate.com
Tue Dec 28 00:06:30 UTC 2004
Log Message:
-----------
Added banner header text font style
Modified Files:
--------------
eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj:
ForumOptions.java
Revision Data
-------------
Index: ForumOptions.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java -u -r1.7 -r1.8
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java
@@ -3,16 +3,13 @@
import java.util.Vector;
import org.apache.log4j.Logger;
-import org.apache.commons.beanutils.*;
-import com.jcorporate.eforum.*;
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.RequestContext;
import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.dbobj.ValidValue;
import com.jcorporate.expresso.core.misc.StringUtil;
-import com.jcorporate.expresso.core.security.User;
/**
@@ -57,13 +54,21 @@
/** Data field name constant */
public static final String FLD_MONO_TEXT_FONT_ID = ForumMonoTextDef.FLD_MONO_TEXT_FONT_ID;
/** Data field name constant */
+ public static final String FLD_HEADER_TEXT_FONT_ID = "HeaderTextFont";
+ /** Data field name constant */
+ public static final String FLD_BANNER_TEXT_FONT_ID = "BannerTextFont";
+ /** Data field name constant */
// public static final String FLD_ = "";
- // 01234567890123456789
+ // 01234567890123456789
+ /** Virtual field constant */
+ public static final String VFLD_VAR_TEXT_FONT_CSSNAME = "VarTxtFntCssName";
/** Virtual field constant */
- public static final String VFLD_VAR_TEXT_FONT_CSSNAME = "VarTxtFntCssName";
+ public static final String VFLD_MONO_TEXT_FONT_CSSNAME = "MonoTxtFntCssName";
/** Virtual field constant */
- public static final String VFLD_MONO_TEXT_FONT_CSSNAME = "MonoTxtFntCssName";
+ public static final String VFLD_HEADER_TEXT_FONT_CSSNAME = "HdrTxtFntCssName";
+ /** Virtual field constant */
+ public static final String VFLD_BANNER_TEXT_FONT_CSSNAME = "BnnrTxtFntCssName";
/**
* Default constructor
@@ -121,13 +126,13 @@
for (int k = 0; k < fieldNames.length; ++k) {
// For all field names which are not keys
if (!metaData.getFieldMetadata(fieldNames[k]).isKey() ) {
- // Check if this field value is empty or not.
- if ( StringUtil.isBlankOrNull( getField(fieldNames[k]) )) {
- // This field is empty. Attempt to use the default value if possible.
- String defval = metaData.getDefaultValue( fieldNames[k] );
- if ( defval != null )
- setField( fieldNames[k] , defval );
- }
+ // Check if this field value is empty or not.
+ if ( StringUtil.isBlankOrNull( getField(fieldNames[k]) )) {
+ // This field is empty. Attempt to use the default value if possible.
+ String defval = metaData.getDefaultValue( fieldNames[k] );
+ if ( defval != null )
+ setField( fieldNames[k] , defval );
+ }
}
}
}
@@ -170,6 +175,20 @@
return var.getField( ForumVarTextDef.FLD_TEXT_FONT_CSSNAME );
return "undefined-cssname";
}
+ else if ( VFLD_HEADER_TEXT_FONT_CSSNAME.equals(fieldName) ||
+ VFLD_BANNER_TEXT_FONT_CSSNAME.equals(fieldName) ) {
+ ForumTextDef textFont = new ForumTextDef();
+ textFont.setDataContext(this.getDataContext());
+ if ( VFLD_HEADER_TEXT_FONT_CSSNAME.equals(fieldName) )
+ textFont.setField( ForumTextDef.FLD_TEXT_FONT_ID,
+ getField( FLD_HEADER_TEXT_FONT_ID ));
+ else if ( VFLD_BANNER_TEXT_FONT_CSSNAME.equals(fieldName) )
+ textFont.setField( ForumTextDef.FLD_TEXT_FONT_ID,
+ getField( FLD_BANNER_TEXT_FONT_ID ));
+ if ( textFont.find())
+ return textFont.getField( ForumVarTextDef.FLD_TEXT_FONT_CSSNAME );
+ return "undefined-cssname";
+ }
return super.getField(fieldName);
}
@@ -193,7 +212,7 @@
addField(FLD_MSG_WIDTH, "int", 0, false, "FN_MsgWidth");
addField(FLD_MSG_HEIGHT, "int", 0, false, "FN_MsgHeight");
addField(FLD_INDENT_REPLIES, "boolean", 0, true, "FN_IdentReplies");
- addField(FLD_INDENT_TEXT, "text", 32, false, "FN_IdentText");
+ addField(FLD_INDENT_TEXT, "varchar", 32, false, "FN_IdentText");
addField(FLD_USE_SIGNATURE, "boolean", 0, true, "FN_UseSignature");
addField(FLD_WORD_WRAP_LENGTH, "int", 0, true, "FN_WordWrapLength");
addField(FLD_AUTO_WRAP_MSG, "boolean", 0, true, "FN_AutoWrapMsg");
@@ -201,12 +220,16 @@
addField(FLD_VAR_TEXT_FONT_ID, "int", 0, false, "FN_Var_Text_Font_Id");
addField(FLD_MONO_TEXT_FONT_ID , "int", 0, false, "FN_Mono_Text_Font_Id");
addField(FLD_DISPLAY_VARIABLE, "boolean", 0, false, "FN_DisplayVariable");
+ addField(FLD_HEADER_TEXT_FONT_ID, "int", 0, false, "FN_Header_Text_Font_Id");
+ addField(FLD_BANNER_TEXT_FONT_ID, "int", 0, false, "FN_Banner_Text_Font_Id");
// addField(FLD_, "int", 0, false, "FN_");
// As convenience add a login name derived field
addVirtualField(VFLD_MONO_TEXT_FONT_CSSNAME, "varchar", 250, "FN_Mono_Text_Font_CssName");
addVirtualField(VFLD_VAR_TEXT_FONT_CSSNAME, "varchar", 250, "FN_Var_Text_Font_CssName");
+ addVirtualField(VFLD_HEADER_TEXT_FONT_CSSNAME, "varchar", 250, "FN_Header_Text_Font_CssName");
+ addVirtualField(VFLD_BANNER_TEXT_FONT_CSSNAME, "varchar", 250, "FN_Banner_Text_Font_CssName");
// Define the primary key fields
addKey(FLD_UID);
@@ -223,6 +246,8 @@
setDefaultValue( FLD_DISPLAY_VARIABLE, "true" );
setDefaultValue( FLD_MONO_TEXT_FONT_ID, "3" );
setDefaultValue( FLD_VAR_TEXT_FONT_ID, "3" );
+ setDefaultValue( FLD_HEADER_TEXT_FONT_ID, "4" );
+ setDefaultValue( FLD_BANNER_TEXT_FONT_ID, "5" );
// TECH NOTE:
@@ -238,10 +263,14 @@
// Define Multiple Values fields
setMultiValued(FLD_VAR_TEXT_FONT_ID);
setMultiValued(FLD_MONO_TEXT_FONT_ID);
+ setMultiValued(FLD_HEADER_TEXT_FONT_ID);
+ setMultiValued(FLD_BANNER_TEXT_FONT_ID);
// Define lookup fields
setLookupObject(FLD_VAR_TEXT_FONT_ID, ForumVarTextDef.class.getName() );
setLookupObject(FLD_MONO_TEXT_FONT_ID, ForumMonoTextDef.class.getName() );
+ setLookupObject(FLD_HEADER_TEXT_FONT_ID, ForumTextDef.class.getName() );
+ setLookupObject(FLD_BANNER_TEXT_FONT_ID, ForumTextDef.class.getName() );
} /* setupFields() */
More information about the cvs
mailing list