You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/01/08 23:54:01 UTC
svn commit: r1056832 [6/17] - in /incubator/isis/trunk:
alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/
alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/
alternati...
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/package-info.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Provides interfaces and utilities used to create detailed string
+ * representations of objects in order that the system may be
+ * debugged.
+ */
+package org.apache.isis.core.commons.debug;
\ No newline at end of file
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtended.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtended.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtended.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtended.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtended.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtended.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtended.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.DataInput;
import java.io.DataInputStream;
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtendedDecorator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtendedDecorator.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputExtendedDecorator.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.DataInputStream;
import java.io.IOException;
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputStreamExtended.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputStreamExtended.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputStreamExtended.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputStreamExtended.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputStreamExtended.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataInputStreamExtended.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataInputStreamExtended.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.DataInputStream;
import java.io.IOException;
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtended.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtended.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtended.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtended.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtended.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtended.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtended.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.DataOutput;
import java.io.DataOutputStream;
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtendedDecorator.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtendedDecorator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtendedDecorator.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtendedDecorator.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtendedDecorator.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputExtendedDecorator.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputExtendedDecorator.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.DataOutputStream;
import java.io.IOException;
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputStreamExtended.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputStreamExtended.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputStreamExtended.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputStreamExtended.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputStreamExtended.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DataOutputStreamExtended.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DataOutputStreamExtended.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.DataOutputStream;
import java.io.IOException;
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataInputExtended.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataInputExtended.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataInputExtended.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.IOException;
import java.util.Arrays;
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataOutputExtended.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataOutputExtended.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/DebugDataOutputExtended.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.IOException;
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/Encodable.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/Encodable.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/Encodable.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/Encodable.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/Encodable.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/Encodable.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/Encodable.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.IOException;
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/EncodingConstants.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/EncodingConstants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/EncodingConstants.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/EncodingConstants.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/EncodingConstants.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/EncodingConstants.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/EncodingConstants.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
public class EncodingConstants {
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FailedToDecodeException.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDecodeException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FailedToDecodeException.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FailedToDecodeException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDecodeException.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDecodeException.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FailedToDecodeException.java Sat Jan 8 22:53:36 2011
@@ -21,7 +21,7 @@
/**
*
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.IOException;
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FailedToDeserializeException.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDeserializeException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FailedToDeserializeException.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FailedToDeserializeException.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDeserializeException.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FailedToDeserializeException.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FailedToDeserializeException.java Sat Jan 8 22:53:36 2011
@@ -21,7 +21,7 @@
/**
*
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.IOException;
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java (from r1056120, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FieldType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FieldType.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/encoding/FieldType.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java Sat Jan 8 22:53:36 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.metamodel.encoding;
+package org.apache.isis.core.commons.encoding;
import java.io.DataInputStream;
import java.io.DataOutputStream;
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/encoding.ucd
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/encoding.ucd?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/encoding.ucd (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/encoding.ucd Sat Jan 8 22:53:36 2011
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<editmodel:ClassDiagramEditModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editmodel="editmodel.xmi" xmlns:options="options.xmi" name="encoding" size="1283,724" id="org.apache.isis.core.commons.encoding" metadata="uml2-1.0" initialized="true" zoom="0.5" tag="1000" key="32303037303533312D31303030206F72672E6170616368652E697369732E636F72652E636F6D6D6F6E732F64616E">
+ <children xsi:type="editmodel:InterfaceEditModel" name="Encodable" location="15,544" size="109,81" id="org.apache.isis.core.commons.encoding/Encodable" runTimeClassModel="encode(Lorg.apache.isis.core.commons.encoding.DataOutputExtended;)">
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="66,18">
+ <children xsi:type="editmodel:MethodEditModel" name="encode" id="org.apache.isis.core.commons.encoding/Encodable#encode(Lorg.apache.isis.core.commons.encoding.DataOutputExtended;)"/>
+ </children>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" name="FieldType" location="989,14" size="274,643" id="org.apache.isis.core.commons.encoding/FieldType" runTimeClassModel="uNSIGNED_BYTE,sHORT_ARRAY,lONG_ARRAY,write(Lorg.apache.isis.core.commons.encoding.DataOutputExtended;LT;),eNCODABLE_ARRAY,toString(),fLOAT_ARRAY,getIdx(),sTRING,eNCODABLE,sERIALIZABLE_ARRAY,bYTE,sERIALIZABLE,dOUBLE,read(Lorg.apache.isis.core.commons.encoding.DataInputExtended;),dOUBLE_ARRAY,bOOLEAN_ARRAY,cls,idx,cHAR,org.apache.isis.core.commons.encoding.FieldType.Indenting,readArray(Lorg.apache.isis.core.commons.encoding.DataInputExtended;Ljava.lang.Class;),bOOLEAN,iNTEGER_ARRAY,uNSIGNED_SHORT,bYTE_ARRAY,get(B),getCls(),sTRING_ARRAY,fLOAT,sHORT,iNTEGER,lONG,cHAR_ARRAY">
+ <children xsi:type="editmodel:CompartmentEditModel" size="251,468">
+ <children xsi:type="editmodel:AttributeEditModel" name="bOOLEAN" id="org.apache.isis.core.commons.encoding/FieldType#bOOLEAN"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="bOOLEAN_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#bOOLEAN_ARRAY"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="bYTE" id="org.apache.isis.core.commons.encoding/FieldType#bYTE"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="bYTE_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#bYTE_ARRAY"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="sHORT" id="org.apache.isis.core.commons.encoding/FieldType#sHORT"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="sHORT_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#sHORT_ARRAY"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="iNTEGER" id="org.apache.isis.core.commons.encoding/FieldType#iNTEGER"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="uNSIGNED_BYTE" id="org.apache.isis.core.commons.encoding/FieldType#uNSIGNED_BYTE"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="uNSIGNED_SHORT" id="org.apache.isis.core.commons.encoding/FieldType#uNSIGNED_SHORT"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="iNTEGER_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#iNTEGER_ARRAY"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="lONG" id="org.apache.isis.core.commons.encoding/FieldType#lONG"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="lONG_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#lONG_ARRAY"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="cHAR" id="org.apache.isis.core.commons.encoding/FieldType#cHAR"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="cHAR_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#cHAR_ARRAY"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="fLOAT" id="org.apache.isis.core.commons.encoding/FieldType#fLOAT"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="fLOAT_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#fLOAT_ARRAY"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="dOUBLE" id="org.apache.isis.core.commons.encoding/FieldType#dOUBLE"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="dOUBLE_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#dOUBLE_ARRAY"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="sTRING" id="org.apache.isis.core.commons.encoding/FieldType#sTRING"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="sTRING_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#sTRING_ARRAY"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="eNCODABLE" id="org.apache.isis.core.commons.encoding/FieldType#eNCODABLE"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="eNCODABLE_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#eNCODABLE_ARRAY"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="sERIALIZABLE" id="org.apache.isis.core.commons.encoding/FieldType#sERIALIZABLE"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="sERIALIZABLE_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#sERIALIZABLE_ARRAY"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="idx" id="org.apache.isis.core.commons.encoding/FieldType#idx"/>
+ <children xsi:type="editmodel:AttributeEditModel" name="cls" id="org.apache.isis.core.commons.encoding/FieldType#cls"/>
+ </children>
+ <children xsi:type="editmodel:CompartmentEditModel" size="103,126">
+ <children xsi:type="editmodel:MethodEditModel" name="get" id="org.apache.isis.core.commons.encoding/FieldType#get(B)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="getIdx" id="org.apache.isis.core.commons.encoding/FieldType#getIdx()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="getCls" id="org.apache.isis.core.commons.encoding/FieldType#getCls()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readArray" id="org.apache.isis.core.commons.encoding/FieldType#readArray(Lorg.apache.isis.core.commons.encoding.DataInputExtended;Ljava.lang.Class;)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="read" id="org.apache.isis.core.commons.encoding/FieldType#read(Lorg.apache.isis.core.commons.encoding.DataInputExtended;)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="write" id="org.apache.isis.core.commons.encoding/FieldType#write(Lorg.apache.isis.core.commons.encoding.DataOutputExtended;LT;)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="toString" id="org.apache.isis.core.commons.encoding/FieldType#toString()"/>
+ </children>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:InterfaceEditModel" targetConnections="//@children.5/@sourceConnections.0" name="DataInputExtended" location="676,13" size="163,315" id="org.apache.isis.core.commons.encoding/DataInputExtended" runTimeClassModel="readFloats(),readBytes(),readSerializable(Ljava.lang.Class;),readUTFs(),readEncodable(Ljava.lang.Class;),readChars(),readDoubles(),readEncodables(Ljava.lang.Class;),readInts(),readBooleans(),readShorts(),readSerializables(Ljava.lang.Class;),getDataInputStream(),readLongs()">
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="134,252">
+ <children xsi:type="editmodel:MethodEditModel" name="getDataInputStream" id="org.apache.isis.core.commons.encoding/DataInputExtended#getDataInputStream()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readBooleans" id="org.apache.isis.core.commons.encoding/DataInputExtended#readBooleans()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readBytes" id="org.apache.isis.core.commons.encoding/DataInputExtended#readBytes()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readChars" id="org.apache.isis.core.commons.encoding/DataInputExtended#readChars()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readDoubles" id="org.apache.isis.core.commons.encoding/DataInputExtended#readDoubles()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readEncodable" id="org.apache.isis.core.commons.encoding/DataInputExtended#readEncodable(Ljava.lang.Class;)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readEncodables" id="org.apache.isis.core.commons.encoding/DataInputExtended#readEncodables(Ljava.lang.Class;)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readFloats" id="org.apache.isis.core.commons.encoding/DataInputExtended#readFloats()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readInts" id="org.apache.isis.core.commons.encoding/DataInputExtended#readInts()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readLongs" id="org.apache.isis.core.commons.encoding/DataInputExtended#readLongs()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readSerializable" id="org.apache.isis.core.commons.encoding/DataInputExtended#readSerializable(Ljava.lang.Class;)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readSerializables" id="org.apache.isis.core.commons.encoding/DataInputExtended#readSerializables(Ljava.lang.Class;)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readShorts" id="org.apache.isis.core.commons.encoding/DataInputExtended#readShorts()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="readUTFs" id="org.apache.isis.core.commons.encoding/DataInputExtended#readUTFs()"/>
+ </children>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.4/@sourceConnections.0" name="DataInputExtendedDecorator" location="757,388" size="225,29" id="org.apache.isis.core.commons.encoding/DataInputExtendedDecorator" runTimeClassModel="">
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.core.commons.encoding/DataInputExtended<-org.apache.isis.core.commons.encoding/DataInputExtendedDecorator" source="//@children.3" target="//@children.5/@sourceConnections.0" targetEnd="//@children.3/@sourceConnections.0/@children.1" sourceEnd="//@children.3/@sourceConnections.0/@children.0" connectionRouterKind="GeneralizationManhattan">
+ <children xsi:type="editmodel:AssociationEndEditModel" location="112,0" anchorKind="FixedAtEdge" attachSource="true"/>
+ <children xsi:type="editmodel:AssociationEndEditModel"/>
+ </sourceConnections>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" name="DebugDataInputExtended" location="768,448" size="204,29" id="org.apache.isis.core.commons.encoding/DebugDataInputExtended" runTimeClassModel="">
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.core.commons.encoding/DataInputExtendedDecorator<-org.apache.isis.core.commons.encoding/DebugDataInputExtended" source="//@children.4" target="//@children.3" targetEnd="//@children.4/@sourceConnections.0/@children.1" sourceEnd="//@children.4/@sourceConnections.0/@children.0" connectionRouterKind="Manual">
+ <children xsi:type="editmodel:AssociationEndEditModel" location="101,0" attachSource="true"/>
+ <children xsi:type="editmodel:AssociationEndEditModel" location="112,29"/>
+ </sourceConnections>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" name="DataInputStreamExtended" location="510,388" size="209,57" id="org.apache.isis.core.commons.encoding/DataInputStreamExtended" runTimeClassModel="dataInputStream">
+ <children xsi:type="editmodel:CompartmentEditModel" size="182,18">
+ <children xsi:type="editmodel:AttributeEditModel" name="dataInputStream" id="org.apache.isis.core.commons.encoding/DataInputStreamExtended#dataInputStream"/>
+ </children>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <sourceConnections xsi:type="editmodel:GeneralizationEditModel" targetConnections="//@children.3/@sourceConnections.0" autoLocated="true" id="org.apache.isis.core.commons.encoding/DataInputExtended<-org.apache.isis.core.commons.encoding/DataInputStreamExtended" source="//@children.5" target="//@children.2" targetEnd="//@children.5/@sourceConnections.0/@children.1" sourceEnd="//@children.5/@sourceConnections.0/@children.0" connectionRouterKind="GeneralizationManhattan">
+ <children xsi:type="editmodel:AssociationEndEditModel" location="104,0" anchorKind="FixedAtEdge" attachSource="true"/>
+ <children xsi:type="editmodel:AssociationEndEditModel" location="81,315" anchorKind="FixedAtEdge"/>
+ </sourceConnections>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" name="DataOutputStreamExtended" location="15,435" size="223,57" id="org.apache.isis.core.commons.encoding/DataOutputStreamExtended" runTimeClassModel="dataOutputStream">
+ <children xsi:type="editmodel:CompartmentEditModel" size="200,18">
+ <children xsi:type="editmodel:AttributeEditModel" name="dataOutputStream" id="org.apache.isis.core.commons.encoding/DataOutputStreamExtended#dataOutputStream"/>
+ </children>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <sourceConnections xsi:type="editmodel:GeneralizationEditModel" id="org.apache.isis.core.commons.encoding/DataOutputExtended<-org.apache.isis.core.commons.encoding/DataOutputStreamExtended" source="//@children.6" target="//@children.9" targetEnd="//@children.6/@sourceConnections.0/@children.1" sourceEnd="//@children.6/@sourceConnections.0/@children.0" connectionRouterKind="Manhattan">
+ <children xsi:type="editmodel:AssociationEndEditModel" location="125,-1" anchorKind="FixedAtEdge" attachSource="true"/>
+ <children xsi:type="editmodel:AssociationEndEditModel" location="86,350"/>
+ </sourceConnections>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" name="DebugDataOutputExtended" location="281,499" size="214,29" id="org.apache.isis.core.commons.encoding/DebugDataOutputExtended" runTimeClassModel="">
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.core.commons.encoding/DataOutputExtendedDecorator<-org.apache.isis.core.commons.encoding/DebugDataOutputExtended" source="//@children.7" target="//@children.8" targetEnd="//@children.7/@sourceConnections.0/@children.1" sourceEnd="//@children.7/@sourceConnections.0/@children.0" connectionRouterKind="Manual">
+ <children xsi:type="editmodel:AssociationEndEditModel" location="106,0" attachSource="true"/>
+ <children xsi:type="editmodel:AssociationEndEditModel" location="127,29"/>
+ </sourceConnections>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.7/@sourceConnections.0" name="DataOutputExtendedDecorator" location="260,435" size="235,29" id="org.apache.isis.core.commons.encoding/DataOutputExtendedDecorator" runTimeClassModel="">
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <sourceConnections xsi:type="editmodel:GeneralizationEditModel" id="org.apache.isis.core.commons.encoding/DataOutputExtended<-org.apache.isis.core.commons.encoding/DataOutputExtendedDecorator" source="//@children.8" target="//@children.9" targetEnd="//@children.8/@sourceConnections.0/@children.1" sourceEnd="//@children.8/@sourceConnections.0/@children.0" connectionRouterKind="Manhattan">
+ <children xsi:type="editmodel:AssociationEndEditModel" location="117,0" anchorKind="FixedAtEdge" attachSource="true"/>
+ <children xsi:type="editmodel:AssociationEndEditModel" location="86,351" anchorKind="FixedAtEdge"/>
+ </sourceConnections>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <children xsi:type="editmodel:InterfaceEditModel" targetConnections="//@children.8/@sourceConnections.0 //@children.6/@sourceConnections.0" name="DataOutputExtended" location="150,14" size="173,351" id="org.apache.isis.core.commons.encoding/DataOutputExtended" runTimeClassModel="writeByte(I),writeBooleans([Z),writeEncodables([Ljava.lang.Object;),getDataOutputStream(),writeUTFs([Ljava.lang.String;),writeSerializables([Ljava.lang.Object;),writeEncodable(Ljava.lang.Object;),writeShorts([S),writeInts([I),writeLongs([J),writeChars([C),writeSerializable(Ljava.lang.Object;),writeBytes([B),writeFloats([F),write(I),writeDoubles([D)">
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <children xsi:type="editmodel:CompartmentEditModel" size="133,288">
+ <children xsi:type="editmodel:MethodEditModel" name="getDataOutputStream" id="org.apache.isis.core.commons.encoding/DataOutputExtended#getDataOutputStream()"/>
+ <children xsi:type="editmodel:MethodEditModel" name="write" id="org.apache.isis.core.commons.encoding/DataOutputExtended#write(I)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeBooleans" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeBooleans([Z)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeByte" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeByte(I)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeBytes" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeBytes([B)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeChars" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeChars([C)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeDoubles" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeDoubles([D)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeEncodable" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeEncodable(Ljava.lang.Object;)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeEncodables" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeEncodables([Ljava.lang.Object;)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeFloats" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeFloats([F)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeInts" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeInts([I)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeLongs" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeLongs([J)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeSerializable" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeSerializable(Ljava.lang.Object;)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeSerializables" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeSerializables([Ljava.lang.Object;)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeShorts" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeShorts([S)"/>
+ <children xsi:type="editmodel:MethodEditModel" name="writeUTFs" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeUTFs([Ljava.lang.String;)"/>
+ </children>
+ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
+ <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+ </children>
+ <diagramOptions xsi:type="options:ClassDiagramOptions" level="-1" showScope="InPackage" properties="wireOptions=3;Product=eUML2"/>
+ <boardSetting snapToGeometry="true" gridEnabled="true" gridSpacing="15,15" gridOrigin="0,0" rulerUnit="pixel" gridVisibility="false">
+ <leftRuler/>
+ <topRuler/>
+ </boardSetting>
+ <classDiagramPreferences xsi:type="editmodel:UMLClassDiagramPreference" showPopupBars="true" showConnectionHandles="true" attributeSorter="Natural" methodSorter="Natural" showClassStereotype="true" showPackageStereotype="true" showDependencyStereotype="true" showInterfaceStereotype="true" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
+</editmodel:ClassDiagramEditModel>
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/package-info.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/encoding/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * The {@link org.apache.isis.core.commons.ensure.Ensure} and {@link org.junit.Assert}
+ * classes provide the ability to specify assertions about state,
+ * throwing an exception ("fail early") if the assertion fails.
+ *
+ * <p>
+ * The {@link org.apache.isis.core.commons.ensure.Ensure} class
+ * uses {@link org.hamcrest.Matcher Hamcrest matcher}s and is
+ * more powerful so generally to be preferred.
+ */
+package org.apache.isis.core.commons.encoding;
\ No newline at end of file
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/ensure/Assert.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/ensure/Assert.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/ensure/Assert.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/ensure/Assert.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,7 @@
package org.apache.isis.core.commons.ensure;
-public class Assert {
+public final class Assert {
public static void assertEquals(final Object expected, final Object actual) {
assertEquals("", expected, actual);
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/ensure/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/ensure/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/ensure/package-info.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/ensure/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Provides an infrastructure for encoding {@link org.apache.isis.core.commons.encoding.Encodable}
+ * into an {@link org.apache.isis.core.commons.encoding.DataOutputExtended output stream}
+ * or from an {@link org.apache.isis.core.commons.encoding.DataInputExtended input stream}.
+ *
+ * <p>
+ * This is primarily for remoting (marshalling objects across the wire) but
+ * is also used in various other places, including the creation of
+ * mementos (to capture state at a point in time).
+ */
+package org.apache.isis.core.commons.ensure;
\ No newline at end of file
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java Sat Jan 8 22:53:36 2011
@@ -23,8 +23,13 @@ package org.apache.isis.core.commons.exc
/**
* Indicates an error raised by the application code.
+ *
+ * <p>
+ * The viewer is expected to render the message within the
+ * application in a user-friendly fashion.
*/
public class IsisApplicationException extends IsisException {
+
private static final long serialVersionUID = 1L;
public IsisApplicationException() {
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java Sat Jan 8 22:53:36 2011
@@ -25,6 +25,10 @@ import java.io.PrintWriter;
import java.text.MessageFormat;
+/**
+ * General exception raised by the framework, typically
+ * a system exception.
+ */
public class IsisException extends RuntimeException {
private static final long serialVersionUID = 1L;
private static boolean THROWABLE_SUPPORTS_CAUSE;
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/NotYetImplementedException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/NotYetImplementedException.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/NotYetImplementedException.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/NotYetImplementedException.java Sat Jan 8 22:53:36 2011
@@ -20,9 +20,6 @@
package org.apache.isis.core.commons.exceptions;
-
-
-
/**
* Flags a method as not having been implemented yet, but is be implemented.
*/
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Defines {@link org.apache.isis.core.commons.exceptions.IsisException base class}
+ * for exceptions raised either by Isis itself or by the domain model
+ * running on top of Isis.
+ */
+package org.apache.isis.core.commons.exceptions;
\ No newline at end of file
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/InstanceUtil.java (from r1056120, incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/InstanceFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/InstanceUtil.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/InstanceUtil.java&p1=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/InstanceFactory.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/InstanceFactory.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/InstanceUtil.java Sat Jan 8 22:53:36 2011
@@ -24,9 +24,9 @@ import org.apache.isis.core.commons.ensu
import org.apache.isis.core.commons.lang.CastUtils;
-public final class InstanceFactory {
+public final class InstanceUtil {
- private InstanceFactory() {}
+ private InstanceUtil() {}
public static Object createInstance(final String className) {
return createInstance(className, (Class<?>)null, null);
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/package-info.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/factory/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Provides a {@link org.apache.isis.core.commons.factory.InstanceUtil utility}
+ * class for instantiating classes, ensuring that
+ * they are assignable from a specified interface (if supplied).
+ *
+ * <p>
+ * Used in various places throughout the framework, and specifically by
+ * {@link org.apache.isis.core.commons.components.Installer} implementations.
+ */
+package org.apache.isis.core.commons.factory;
\ No newline at end of file
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/futures/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/futures/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/futures/package-info.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/futures/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Defines an {@link org.apache.isis.core.commons.futures.FutureResultFactory API} to generate results of
+ * any given type as a future.
+ *
+ * <p>
+ * Also incorporates an {@link org.apache.isis.core.commons.futures.FutureFactory SPI} by which
+ * a bytecode manipulation library (eg cglib or javassist) can synthesize the future
+ * as a proxy that will delegate to the provided {@link org.apache.isis.core.commons.futures.FutureResultFactory} to
+ * actually generate the result.
+ *
+ * <p>
+ * Note: at the time of writing this mini-framework is unused. It was originally
+ * developed for JUnit viewer, though subsequent refactorings have meant that
+ * it is not required at the moment. Nevertheless, we have chosen to keep this
+ * code base rather than remove it.
+ */
+package org.apache.isis.core.commons.futures;
\ No newline at end of file
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/LazyInputStream.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/LazyInputStream.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/LazyInputStream.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/LazyInputStream.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,183 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.isis.core.commons.io;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.isis.core.commons.ensure.Ensure;
+
+/**
+ * An input stream that reads from an underlying {@link InputStream}, deferring
+ * the interactions until needed.
+ *
+ * <p>
+ * This other stream is provided as needed by an {@link InputStreamProvider} so
+ * that the underlying stream is not eagerly loaded.
+ */
+public class LazyInputStream extends InputStream {
+
+ /**
+ * An interface to be implemented by clients that wish to utilize
+ * {@link LazyInputStream}s. The implementation of this interface should
+ * defer obtaining the desired input stream until absolutely necessary.
+ */
+ public static interface InputStreamProvider {
+ InputStream getInputStream() throws IOException;
+ }
+
+ private InputStreamProvider provider;
+
+ private InputStream underlying = null;
+
+ // ///////////////////////////////////////////////////////
+ // Constructor
+ // ///////////////////////////////////////////////////////
+
+ /**
+ * Construct a new lazy stream based off the given provider.
+ *
+ * @param provider
+ * the input stream provider. Must not be <code>null</code>.
+ */
+ public LazyInputStream(InputStreamProvider provider) {
+ Ensure.ensureThatArg(provider, is(not(nullValue())));
+ this.provider = provider;
+ }
+
+ // ///////////////////////////////////////////////////////
+ // InputStream API
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public void close() throws IOException {
+ obtainUnderlyingIfRequired();
+ underlying.close();
+ }
+
+ @Override
+ public int available() throws IOException {
+ obtainUnderlyingIfRequired();
+ return underlying.available();
+ }
+
+ @Override
+ public void mark(int readlimit) {
+ try {
+ obtainUnderlyingIfRequired();
+ underlying.mark(readlimit);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public boolean markSupported() {
+ try {
+ obtainUnderlyingIfRequired();
+ return underlying.markSupported();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public int read() throws IOException {
+ obtainUnderlyingIfRequired();
+ return underlying.read();
+ }
+
+ @Override
+ public int read(byte[] b, int off, int len) throws IOException {
+ obtainUnderlyingIfRequired();
+ return underlying.read(b, off, len);
+ }
+
+ @Override
+ public int read(byte[] b) throws IOException {
+ obtainUnderlyingIfRequired();
+ return underlying.read(b);
+ }
+
+ @Override
+ public long skip(long n) throws IOException {
+ obtainUnderlyingIfRequired();
+ return underlying.skip(n);
+ }
+
+ @Override
+ public void reset() throws IOException {
+ obtainUnderlyingIfRequired();
+ underlying.reset();
+ }
+
+ // ///////////////////////////////////////////////////////
+ // helpers
+ // ///////////////////////////////////////////////////////
+
+ private void obtainUnderlyingIfRequired() throws IOException {
+ if (underlying == null) {
+ underlying = provider.getInputStream();
+ }
+ }
+
+ // ///////////////////////////////////////////////////////
+ // equals, hashCode
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public boolean equals(Object obj) {
+ try {
+ obtainUnderlyingIfRequired();
+ return underlying.equals(obj);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ try {
+ obtainUnderlyingIfRequired();
+ return underlying.hashCode();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ // ///////////////////////////////////////////////////////
+ // toString
+ // ///////////////////////////////////////////////////////
+
+ public String toString() {
+ try {
+ obtainUnderlyingIfRequired();
+ return underlying.toString();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/package-info.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * This package holds a small number of utilities for working with the Java i/o libraries.
+ */
+package org.apache.isis.core.commons.io;
\ No newline at end of file
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtils.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtils.java Sat Jan 8 22:53:36 2011
@@ -21,62 +21,19 @@
package org.apache.isis.core.commons.lang;
import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import org.apache.isis.core.commons.exceptions.IsisException;
public final class ArrayUtils {
private ArrayUtils() {}
- public static Object[] getObjectAsObjectArray(final Object option) {
- final Class<?> arrayType = option.getClass().getComponentType();
- if (!arrayType.isPrimitive()) {
- return (Object[]) option;
- }
- if (arrayType == char.class) {
- return convertCharToCharacterArray(option);
- } else {
- return convertPrimitiveToObjectArray(arrayType, option);
- }
- }
-
-
- private static Object[] convertPrimitiveToObjectArray(
- final Class<?> arrayType, final Object originalArray) {
- Object[] convertedArray;
- try {
- final Class<?> wrapperClass = WrapperUtils.wrap(arrayType);
- final Constructor<?> constructor = wrapperClass.getConstructor(new Class[] { String.class });
- final int len = Array.getLength(originalArray);
- convertedArray = (Object[]) Array.newInstance(wrapperClass, len);
- for (int i = 0; i < len; i++) {
- convertedArray[i] = constructor.newInstance(new Object[] { Array.get(originalArray, i).toString() });
- }
- } catch (final NoSuchMethodException e) {
- throw new IsisException(e);
- } catch (final ArrayIndexOutOfBoundsException e) {
- throw new IsisException(e);
- } catch (final IllegalArgumentException e) {
- throw new IsisException(e);
- } catch (final InstantiationException e) {
- throw new IsisException(e);
- } catch (final IllegalAccessException e) {
- throw new IsisException(e);
- } catch (final InvocationTargetException e) {
- throw new IsisException(e);
- }
- return convertedArray;
- }
-
- private static Object[] convertCharToCharacterArray(final Object originalArray) {
+ public static Object[] convertCharToCharacterArray(final Object originalArray) {
final char[] original = (char[]) originalArray;
final int len = original.length;
final Character[] converted = new Character[len];
@@ -172,19 +129,6 @@ public final class ArrayUtils {
return destination;
}
- private static <D,S> void copyFromInto(S[] source, D[] destination) {
- if (source == null) {
- throw new IllegalArgumentException("Source array cannot be null");
- }
- if (destination == null) {
- throw new IllegalArgumentException("Destination array cannot be null");
- }
- if (source.length != destination.length) {
- throw new IllegalArgumentException("Source and destination arrays must be same length");
- }
- System.arraycopy(source, 0, destination, 0, source.length);
- }
-
}
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/IoUtils.java (from r1056120, incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/IoUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/IoUtils.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/IoUtils.java&p1=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/IoUtils.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/io/IoUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/IoUtils.java Sat Jan 8 22:53:36 2011
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.core.commons.io;
+package org.apache.isis.core.commons.lang;
-import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
@@ -67,29 +67,20 @@ public final class IoUtils {
return count;
}
- public static void closeSafely(InputStream in) {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- // ignore
- }
- }
- }
-
- public static void closeSafely(BufferedReader reader) {
- if (reader != null) {
- try {
- reader.close();
- } catch (final IOException ignore) {}
- }
- }
-
- public static InputStream asInputStream(String string) throws UnsupportedEncodingException {
+ public static InputStream asUtf8ByteStream(String string) throws UnsupportedEncodingException {
byte[] data = string.getBytes("utf-8");
InputStream in = new ByteArrayInputStream(data);
return in;
}
+
+ public static void closeSafely(Closeable reader) {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (final IOException ignore) {}
+ }
+ }
+
}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/JavaClassUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/JavaClassUtils.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/JavaClassUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/JavaClassUtils.java Sat Jan 8 22:53:36 2011
@@ -98,6 +98,61 @@ public final class JavaClassUtils {
classList.add(service.getClass());
}
return classList;
+ }
+
+
+ /**
+ * Returns the supplied Class so long as it implements (or is a subclass of) the
+ * required class, and also has either a constructor accepting the specified param type,
+ * or has a no-arg constructor.
+ */
+ public static Class<?> implementingClassOrNull(final Class<?> classCandidate, final Class<?> requiredClass, final Class<?> constructorParamType) {
+ if (classCandidate == null) {
+ return null;
+ }
+ if (!requiredClass.isAssignableFrom(classCandidate)) {
+ return null;
+ }
+ try {
+ classCandidate.getConstructor(new Class[] {constructorParamType});
+ } catch (final NoSuchMethodException ex) {
+ try {
+ classCandidate.getConstructor(new Class[]{});
+ } catch (NoSuchMethodException e) {
+ return null;
+ }
+ } catch (final SecurityException e) {
+ return null;
+ }
+ final int modifiers = classCandidate.getModifiers();
+ if (!Modifier.isPublic(modifiers)) {
+ return null;
+ }
+ return classCandidate;
+ }
+
+
+ public static Class<?> implementingClassOrNull(final String classCandidateName, final Class<?> requiredClass, final Class<?> constructorParamType) {
+ if (classCandidateName == null) {
+ return null;
+ }
+ Class<?> classCandidate = null;
+ try {
+ classCandidate = Class.forName(classCandidateName);
+ return implementingClassOrNull(classCandidate, requiredClass, constructorParamType);
+ } catch (final ClassNotFoundException e) {
+ return null;
+ }
+ }
+
+
+ public static boolean directlyImplements(final Class<?> cls, final Class<?> interfaceType) {
+ for(Class<?> directlyImplementedInterface: cls.getInterfaces()) {
+ if (directlyImplementedInterface == interfaceType) {
+ return true;
+ }
+ }
+ return false;
}
Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ThrowableUtils.java (from r1056120, incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionHelper.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ThrowableUtils.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ThrowableUtils.java&p1=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionHelper.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionHelper.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ThrowableUtils.java Sat Jan 8 22:53:36 2011
@@ -18,16 +18,16 @@
*/
-package org.apache.isis.core.commons.exceptions;
+package org.apache.isis.core.commons.lang;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
-public class ExceptionHelper {
+public final class ThrowableUtils {
- public static String exceptionTraceAsString(final Throwable exception) {
+ public static String stackTraceFor(final Throwable exception) {
ByteArrayOutputStream baos = null;
try {
baos = new ByteArrayOutputStream();
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ToString.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ToString.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ToString.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ToString.java Sat Jan 8 22:53:36 2011
@@ -20,7 +20,6 @@
package org.apache.isis.core.commons.lang;
-import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/package-info.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * This package holds a small number of classes to extend the JDK.
+ *
+ * <p>
+ * These classes should be thought of as being in the same spirit as
+ * the google <i>guava</i> library helper classes (and some may be replaced by guava in the future).
+ */
+package org.apache.isis.core.commons.lang;
\ No newline at end of file
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/matchers/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/matchers/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/matchers/package-info.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/matchers/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Provides a set of Hamcrest {@link org.hamcrest.Matcher}s for various
+ * purposes.
+ */
+package org.apache.isis.core.commons.matchers;
\ No newline at end of file
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/package-info.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Provides an {@link org.apache.isis.core.commons.resource.ResourceStreamSource abstraction}
+ * over {@link java.io.InputStream}s for accessing
+ * resources.
+ *
+ * <p>
+ * The principle usage is to allow the easy searching of a single resource (eg
+ * <tt>isis.properties</tt> file) in {@link org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath multiple}
+ * {@link org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassClassPath locations}
+ * and {@link org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem technologies}
+ * on the classpath through
+ * the use of a {@link org.apache.isis.core.commons.resource.ResourceStreamSourceComposite composite}
+ * pattern.
+ */
+package org.apache.isis.core.commons.resource;
\ No newline at end of file
Added: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/package-info.java?rev=1056832&view=auto
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/package-info.java (added)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/package-info.java Sat Jan 8 22:53:36 2011
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Provides helper classes for writing alternative implementations
+ * that just persist to a proprietary XML format.
+ *
+ * <p>
+ * Specifically, these classes are used by the <i>XmlObjectStore</i>
+ * and the <i>XmlProfileStore</i>.
+ */
+package org.apache.isis.core.commons.xml;
\ No newline at end of file
Copied: incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java (from r1056120, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/loader/ConfigurationBuilderFileSystemTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java?p2=incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/loader/ConfigurationBuilderFileSystemTest.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/loader/ConfigurationBuilderFileSystemTest.java (original)
+++ incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java Sat Jan 8 22:53:36 2011
@@ -18,26 +18,26 @@
*/
-package org.apache.isis.core.metamodel.config.loader;
+package org.apache.isis.core.commons.config;
import junit.framework.TestCase;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilderFileSystem;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.NotFoundPolicy;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilderFileSystem;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.config.NotFoundPolicy;
public class ConfigurationBuilderFileSystemTest extends TestCase {
- ConfigurationBuilderFileSystem loader;
+ IsisConfigurationBuilderFileSystem loader;
@Override
protected void setUp() throws Exception {
Logger.getRootLogger().setLevel(Level.OFF);
- loader = new ConfigurationBuilderFileSystem("src/test/config");
+ loader = new IsisConfigurationBuilderFileSystem("src/test/config");
}
public void testDefaultConfiguration() {