svn commit: [jahia] r14839 - in /trunk/core/src/java/org/jahia/data/fields: JahiaApplicationField.java JahiaDateField.java JahiaFloatField.java

[tdraier]

Author: tdraier
Date: Thu Aug  3 15:47:43 2006
New Revision: 14839

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14839&repname=jahia
Log:
fixed date/app/float fields creation

Modified:
    trunk/core/src/java/org/jahia/data/fields/JahiaApplicationField.java
    trunk/core/src/java/org/jahia/data/fields/JahiaDateField.java
    trunk/core/src/java/org/jahia/data/fields/JahiaFloatField.java

Modified: trunk/core/src/java/org/jahia/data/fields/JahiaApplicationField.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/data/fields/JahiaApplicationField.java&rev=14839&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/data/fields/JahiaApplicationField.java 
(original)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaApplicationField.java Thu 
Aug  3 15:47:43 2006
@@ -192,7 +192,7 @@
             if ( this.getValue() != null && !this.getValue().equals("<empty>") 
){
                 ContentApplicationField contentField = 
(ContentApplicationField)ContentField.getField(this.getID());
 
-                if (getValue().equals(contentField.getValue(jParams))) {
+                if (contentField.hasActiveEntries() && 
getValue().equals(contentField.getValue(jParams))) {
                     return true;
                 }
 

Modified: trunk/core/src/java/org/jahia/data/fields/JahiaDateField.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/data/fields/JahiaDateField.java&rev=14839&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/data/fields/JahiaDateField.java (original)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaDateField.java Thu Aug  3 
15:47:43 2006
@@ -19,9 +19,6 @@
 
 package org.jahia.data.fields;
 
-import java.util.*;
-import java.text.SimpleDateFormat;
-
 import org.jahia.data.ConnectionTypes;
 import org.jahia.exceptions.JahiaException;
 import org.jahia.params.ProcessingContext;
@@ -30,10 +27,13 @@
 import org.jahia.services.fields.ContentField;
 import org.jahia.services.pages.JahiaPage;
 import org.jahia.services.pages.JahiaPageService;
-import org.jahia.services.version.EntrySaveRequest;
 import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.services.version.EntrySaveRequest;
 import org.jahia.sharing.FieldSharingManager;
 
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 public class JahiaDateField extends JahiaField implements
     JahiaAllowApplyChangeToAllLangField, JahiaSimpleField {
     static private TimeZone tz = TimeZone.getTimeZone("UTC");
@@ -146,7 +146,7 @@
         ContentDateField contentField = (ContentDateField) ContentField.
                                         getField(getID());
 
-        if (getValue()==null || 
getValue().equals(contentField.getValue(jParams))) {
+        if (contentField.hasActiveEntries() && (getValue()==null || 
getValue().equals(contentField.getValue(jParams)))) {
             return true;
         }
 

Modified: trunk/core/src/java/org/jahia/data/fields/JahiaFloatField.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/data/fields/JahiaFloatField.java&rev=14839&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/data/fields/JahiaFloatField.java (original)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaFloatField.java Thu Aug  3 
15:47:43 2006
@@ -19,8 +19,6 @@
 
 package org.jahia.data.fields;
 
-import java.util.Properties;
-
 import org.jahia.data.ConnectionTypes;
 import org.jahia.data.FormDataManager;
 import org.jahia.exceptions.JahiaException;
@@ -28,10 +26,12 @@
 import org.jahia.registries.ServicesRegistry;
 import org.jahia.services.fields.ContentField;
 import org.jahia.services.fields.ContentFloatField;
-import org.jahia.services.version.EntrySaveRequest;
 import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.services.version.EntrySaveRequest;
 import org.jahia.sharing.FieldSharingManager;
 
+import java.util.Properties;
+
 public class JahiaFloatField extends JahiaField implements JahiaSimpleField, 
JahiaAllowApplyChangeToAllLangField
 {
 
@@ -123,7 +123,7 @@
 
         EntrySaveRequest saveRequest = new 
EntrySaveRequest(jParams.getUser(),getLanguageCode());
         ContentFloatField contentField = 
(ContentFloatField)ContentField.getField(getID());
-        if (getValue().equals(contentField.getValue(jParams))) {
+        if (contentField.hasActiveEntries() && (getValue()==null || 
getValue().equals(contentField.getValue(jParams)))) {
             return true;
         }
         try {