[isidorus-cvs] r655 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base

[lgiessmann at common-lisp.net]

Author: lgiessmann
Date: Thu Jul 21 01:31:07 2011
New Revision: 655

Log:
gdl-frontend: Widgets: fixed a bug in GdlVisibleObject.getBorderColor when getting the default border color

Modified:
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java

Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java	Thu Jul 21 01:26:39 2011	(r654)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java	Thu Jul 21 01:31:07 2011	(r655)
@@ -424,8 +424,10 @@
 			colorOcc = getNoneOrOneUnscopedOccurrence(GdlPsis.OccurrenceType.gdlBorderColor);
 		}
 
-		if(colorOcc == null ){
+		if(colorOcc == null && styleClass != null){
 			return null;
+		} else if(colorOcc == null) {
+			return new ColorValue();
 		} else {
 			return new ColorValue(colorOcc.getValue());
 		}