From odf-commits-return-756-apmail-incubator-odf-commits-archive=incubator.apache.org@incubator.apache.org Thu Apr 5 22:03:54 2012 Return-Path: X-Original-To: apmail-incubator-odf-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-odf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 15BD59896 for ; Thu, 5 Apr 2012 22:03:54 +0000 (UTC) Received: (qmail 13578 invoked by uid 500); 5 Apr 2012 22:03:54 -0000 Delivered-To: apmail-incubator-odf-commits-archive@incubator.apache.org Received: (qmail 13548 invoked by uid 500); 5 Apr 2012 22:03:54 -0000 Mailing-List: contact odf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: odf-dev@incubator.apache.org Delivered-To: mailing list odf-commits@incubator.apache.org Received: (qmail 13540 invoked by uid 99); 5 Apr 2012 22:03:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Apr 2012 22:03:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Apr 2012 22:03:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1A80123889E3; Thu, 5 Apr 2012 22:03:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1310096 - in /incubator/odf/trunk: generator/schema2template/src/main/resources/examples/odf/odfdom-java/dom/java-odfdom-stylefamily.vm odfdom/src/main/java/org/odftoolkit/odfdom/dom/style/OdfStyleFamily.java validator/pom.xml Date: Thu, 05 Apr 2012 22:03:31 -0000 To: odf-commits@incubator.apache.org From: svanteschubert@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120405220332.1A80123889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: svanteschubert Date: Thu Apr 5 22:03:31 2012 New Revision: 1310096 URL: http://svn.apache.org/viewvc?rev=1310096&view=rev Log: #ODFTOOLKIT-299# Fix for JDK 7: TreeSet workaround for StyleFamily [Developer:svanteschubert] Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/dom/java-odfdom-stylefamily.vm incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/style/OdfStyleFamily.java incubator/odf/trunk/validator/pom.xml Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/dom/java-odfdom-stylefamily.vm URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/dom/java-odfdom-stylefamily.vm?rev=1310096&r1=1310095&r2=1310096&view=diff ============================================================================== --- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/dom/java-odfdom-stylefamily.vm (original) +++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/dom/java-odfdom-stylefamily.vm Thu Apr 5 22:03:31 2012 @@ -33,7 +33,8 @@ */ package org.odftoolkit.odfdom.dom.style; -import org.odftoolkit.odfdom.dom.attribute.style.StyleFamilyAttribute; +import java.util.Arrays; +import java.util.Collections; import org.odftoolkit.odfdom.dom.style.props.OdfStyleProperty; import java.util.Set; import java.util.TreeSet; @@ -48,8 +49,6 @@ import org.odftoolkit.odfdom.dom.element public class OdfStyleFamily implements Comparable { - private String m_name; -// private Class m_styleClass; private Set m_properties = new TreeSet(); private static Map m_familyByName = new HashMap(); @@ -57,15 +56,17 @@ public class OdfStyleFamily implements C return m_familyByName.get(name); } - private OdfStyleFamily(String name /*, Class styleClass*/, OdfStyleProperty[] props) { + private OdfStyleFamily(String name, OdfStyleProperty[] props) { m_name = name; -// m_styleClass = styleClass; - for (OdfStyleProperty prop : props) { - m_properties.add(prop); - } + m_properties.addAll(Arrays.asList(props)); m_familyByName.put(name, this); } + private OdfStyleFamily(String name) { + m_name = name; + m_familyByName.put(name, this); + } + public String getName() { return m_name; } @@ -76,17 +77,19 @@ public class OdfStyleFamily implements C public static OdfStyleFamily valueOf(String name) { OdfStyleFamily family = getByName(name); - if (family == null) - family = new OdfStyleFamily(name, new OdfStyleProperty[]{ null }); - + if (family == null) { + family = new OdfStyleFamily(name); + } return family; } public static String toString(OdfStyleFamily family) { - if (family != null) + if (family != null) { return family.toString(); - else + } + else { return new String(); + } } @Override @@ -95,7 +98,7 @@ public class OdfStyleFamily implements C } public Set getProperties() { - return m_properties; + return Collections.unmodifiableSet(m_properties); } #foreach ($family in ${odfmodel.getStyleFamilies()}) Modified: incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/style/OdfStyleFamily.java URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/style/OdfStyleFamily.java?rev=1310096&r1=1310095&r2=1310096&view=diff ============================================================================== --- incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/style/OdfStyleFamily.java (original) +++ incubator/odf/trunk/odfdom/src/main/java/org/odftoolkit/odfdom/dom/style/OdfStyleFamily.java Thu Apr 5 22:03:31 2012 @@ -26,7 +26,8 @@ */ package org.odftoolkit.odfdom.dom.style; -import org.odftoolkit.odfdom.dom.attribute.style.StyleFamilyAttribute; +import java.util.Arrays; +import java.util.Collections; import org.odftoolkit.odfdom.dom.style.props.OdfStyleProperty; import java.util.Set; import java.util.TreeSet; @@ -50,7 +51,6 @@ import org.odftoolkit.odfdom.dom.element public class OdfStyleFamily implements Comparable { private String m_name; -// private Class m_styleClass; private Set m_properties = new TreeSet(); private static Map m_familyByName = new HashMap(); @@ -58,15 +58,17 @@ public class OdfStyleFamily implements C return m_familyByName.get(name); } - private OdfStyleFamily(String name /*, Class styleClass*/, OdfStyleProperty[] props) { + private OdfStyleFamily(String name, OdfStyleProperty[] props) { m_name = name; -// m_styleClass = styleClass; - for (OdfStyleProperty prop : props) { - m_properties.add(prop); - } + m_properties.addAll(Arrays.asList(props)); m_familyByName.put(name, this); } + private OdfStyleFamily(String name) { + m_name = name; + m_familyByName.put(name, this); + } + public String getName() { return m_name; } @@ -77,17 +79,19 @@ public class OdfStyleFamily implements C public static OdfStyleFamily valueOf(String name) { OdfStyleFamily family = getByName(name); - if (family == null) - family = new OdfStyleFamily(name, new OdfStyleProperty[]{ null }); - + if (family == null) { + family = new OdfStyleFamily(name); + } return family; } public static String toString(OdfStyleFamily family) { - if (family != null) + if (family != null) { return family.toString(); - else + } + else { return new String(); + } } @Override @@ -96,7 +100,7 @@ public class OdfStyleFamily implements C } public Set getProperties() { - return m_properties; + return Collections.unmodifiableSet(m_properties); } public final static OdfStyleFamily Chart = new OdfStyleFamily("chart", Modified: incubator/odf/trunk/validator/pom.xml URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/pom.xml?rev=1310096&r1=1310095&r2=1310096&view=diff ============================================================================== --- incubator/odf/trunk/validator/pom.xml (original) +++ incubator/odf/trunk/validator/pom.xml Thu Apr 5 22:03:31 2012 @@ -46,7 +46,6 @@ UTF-8 yyyy-MM-dd'T'HH:mm:ss - Tomcat