svnno****@sourc*****
svnno****@sourc*****
2008年 9月 26日 (金) 01:20:59 JST
Revision: 1964
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1964
Author: daisuke_m
Date: 2008-09-26 01:20:59 +0900 (Fri, 26 Sep 2008)
Log Message:
-----------
型移動に伴う修正あれこれ。
Modified Paths:
--------------
artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableListTest.java
artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.java
artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/model/node/TableModelTest.java
artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/package-info.java
artemis/trunk/org.jiemamy.view/META-INF/MANIFEST.MF
artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/model/presentation/package-info.java
vesta/trunk/org.jiemamy.eclipse/pom.xml
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF
zeus/trunk/org.jiemamy.spec.event/META-INF/MANIFEST.MF
zeus/trunk/org.jiemamy.spec.view/META-INF/MANIFEST.MF
zeus/trunk/org.jiemamy.spec.view/pom.xml
Added Paths:
-----------
artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/utils/JmPointUtil.java
zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/
zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmColor.java
zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmPoint.java
zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmRectangle.java
Removed Paths:
-------------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmPointUtil.java
zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/spec/geometory/
-------------- next part --------------
Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmPointUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmPointUtil.java 2008-09-24 17:23:37 UTC (rev 1963)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/utils/JmPointUtil.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -1,96 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/30
- *
- * This file is part of Jiemamy.
- *
- * Licensed 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.jiemamy.core.utils;
-
-import org.jiemamy.spec.geometory.JmPoint;
-import org.jiemamy.spec.geometory.JmRectangle;
-
-/**
- * 座標操作ユーティリティクラス。
- * @author daisuke
- */
-public class JmPointUtil {
-
- /**
- * 2点の差を求める。
- *
- * @param from 基準点
- * @param to 対象点
- * @return 差
- */
- public static JmPoint delta(JmPoint from, JmPoint to) {
- return new JmPoint(from.x - to.x, from.y - to.y);
- }
-
- /**
- * 矩形の配置点（左上）2点の差を求める。
- *
- * @param from 基準矩形
- * @param to 対象矩形
- * @return 差
- */
- public static JmPoint delta(JmRectangle from, JmRectangle to) {
- return new JmPoint(from.x - to.x, from.y - to.y);
- }
-
- /**
- * 位置を負方向に移動させる。
- * @param target 移動対象
- * @param x X軸移動量
- * @param y Y軸移動量
- */
- public static void shiftNegative(JmPoint target, int x, int y) {
- target.x -= x;
- target.y -= y;
- }
-
- /**
- * 位置を負方向に移動させる。
- * @param target 移動対象
- * @param delta 移動量
- */
- public static void shiftNegative(JmPoint target, JmPoint delta) {
- target.x -= delta.x;
- target.y -= delta.y;
- }
-
- /**
- * 位置を正方向に移動させる。
- * @param target 移動対象
- * @param x X軸移動量
- * @param y Y軸移動量
- */
- public static void shiftPositive(JmPoint target, int x, int y) {
- target.x += x;
- target.y += y;
- }
-
- /**
- * 位置を正方向に移動させる。
- * @param target 移動対象
- * @param delta 移動量
- */
- public static void shiftPositive(JmPoint target, JmPoint delta) {
- target.x += delta.x;
- target.y += delta.y;
- }
-
- private JmPointUtil() {
- }
-}
Modified: artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableListTest.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableListTest.java 2008-09-24 17:23:37 UTC (rev 1963)
+++ artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableListTest.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -33,12 +33,13 @@
import org.seasar.framework.container.S2Container;
import org.seasar.framework.container.factory.S2ContainerFactory;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.event.ObservableCollectionChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent.Timing;
import org.jiemamy.core.model.typedef.datatype.impl.IntegerDataTypeMock;
import org.jiemamy.core.model.typedef.datatype.impl.TimestampDataTypeMock;
import org.jiemamy.core.model.typedef.datatype.impl.VarcharDataTypeMock;
+import org.jiemamy.spec.event.ObservableCollectionChangeEvent;
+import org.jiemamy.spec.event.ObservableCollectionChangeListener;
+import org.jiemamy.spec.event.ObservableCollectionChangeEvent.Timing;
+import org.jiemamy.spec.event.collectionimpl.ObservableList;
import org.jiemamy.spec.model.ColumnModel;
import org.jiemamy.spec.model.datatype.DataType;
Modified: artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.java 2008-09-24 17:23:37 UTC (rev 1963)
+++ artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/event/collectionimpl/ObservableMapTest.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -33,12 +33,13 @@
import org.seasar.framework.container.S2Container;
import org.seasar.framework.container.factory.S2ContainerFactory;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.event.ObservableCollectionChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent.Timing;
import org.jiemamy.core.model.typedef.datatype.impl.IntegerDataTypeMock;
import org.jiemamy.core.model.typedef.datatype.impl.TimestampDataTypeMock;
import org.jiemamy.core.model.typedef.datatype.impl.VarcharDataTypeMock;
+import org.jiemamy.spec.event.ObservableCollectionChangeEvent;
+import org.jiemamy.spec.event.ObservableCollectionChangeListener;
+import org.jiemamy.spec.event.ObservableCollectionChangeEvent.Timing;
+import org.jiemamy.spec.event.collectionimpl.ObservableMap;
import org.jiemamy.spec.model.ColumnModel;
import org.jiemamy.spec.model.datatype.DataType;
Modified: artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/model/node/TableModelTest.java
===================================================================
--- artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/model/node/TableModelTest.java 2008-09-24 17:23:37 UTC (rev 1963)
+++ artemis/trunk/org.jiemamy.event/src/test/java/org/jiemamy/core/model/node/TableModelTest.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -27,11 +27,9 @@
import org.seasar.framework.container.S2Container;
import org.seasar.framework.container.factory.S2ContainerFactory;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
import org.jiemamy.core.event.SetterInterceptor;
import org.jiemamy.core.event.collectionimpl.ObservableListTest;
-import org.jiemamy.core.event.model.node.TableModelChangeListener;
-import org.jiemamy.core.event.model.node.TableModelChangeSupport;
+import org.jiemamy.spec.event.ObservableCollectionChangeEvent;
import org.jiemamy.spec.model.ColumnModel;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.constraint.CheckConstraintModel;
Modified: artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/package-info.java 2008-09-24 17:23:37 UTC (rev 1963)
+++ artemis/trunk/org.jiemamy.serializer/src/main/java/org/jiemamy/serializer/model/package-info.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -1,10 +1,2 @@
-/**
- * Jiemamyのシリアライゼーション（XML）モデル関係クラスを提供するパッケージ。
- *
- * このパッケージは、XMLシリアライゼーションに利用されるモデルクラスを含む。
- * {@link org.jiemamy.core.model}パッケージのクラスとマッピングされる。
- *
- * @author daisuke
- */
package org.jiemamy.serializer.model;
Modified: artemis/trunk/org.jiemamy.view/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.view/META-INF/MANIFEST.MF 2008-09-24 17:23:37 UTC (rev 1963)
+++ artemis/trunk/org.jiemamy.view/META-INF/MANIFEST.MF 2008-09-25 16:20:59 UTC (rev 1964)
@@ -32,4 +32,5 @@
Require-Bundle: org.jiemamy.spec.core,
org.jiemamy.spec.view
Export-Package: org.jiemamy.core.model.presentation,
+ org.jiemamy.core.utils,
org.jiemamy.core.utils.processor.root.presentation
Modified: artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/model/presentation/package-info.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/model/presentation/package-info.java 2008-09-24 17:23:37 UTC (rev 1963)
+++ artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/model/presentation/package-info.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -1,12 +1,2 @@
-/**
- * Jiemamyの「ダイアグラム表現」を提供するパッケージ。
- *
- * このパッケージは、ダイアグラム情報を視覚的に表示するための情報を表現するドメインモデルクラスを含む。
- * ダイアグラム表現とは、1つのダイアグラム情報をどの様に表現するか、すなわちノードの位置情報、色情報、表示/非表示情報などの事である。
- * 1つのダイアグラム情報も、全てのノードを表示したい場合よりも、特定のエンティティを中心とした関連ノードのみを表示したい場合が
- * 多い為、1つのダイアグラムは複数の「ダイアグラム表現」を持つことになる。
- *
- * @author daisuke
- */
package org.jiemamy.core.model.presentation;
Added: artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/utils/JmPointUtil.java
===================================================================
--- artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/utils/JmPointUtil.java (rev 0)
+++ artemis/trunk/org.jiemamy.view/src/main/java/org/jiemamy/core/utils/JmPointUtil.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -0,0 +1,79 @@
+package org.jiemamy.core.utils;
+
+
+import org.jiemamy.spec.geometory.JmPoint;
+import org.jiemamy.spec.geometory.JmRectangle;
+
+/**
+ * 座標操作ユーティリティクラス。
+ * @author daisuke
+ */
+public class JmPointUtil {
+
+ /**
+ * 2点の差を求める。
+ *
+ * @param from 基準点
+ * @param to 対象点
+ * @return 差
+ */
+ public static JmPoint delta(JmPoint from, JmPoint to) {
+ return new JmPoint(from.x - to.x, from.y - to.y);
+ }
+
+ /**
+ * 矩形の配置点（左上）2点の差を求める。
+ *
+ * @param from 基準矩形
+ * @param to 対象矩形
+ * @return 差
+ */
+ public static JmPoint delta(JmRectangle from, JmRectangle to) {
+ return new JmPoint(from.x - to.x, from.y - to.y);
+ }
+
+ /**
+ * 位置を負方向に移動させる。
+ * @param target 移動対象
+ * @param x X軸移動量
+ * @param y Y軸移動量
+ */
+ public static void shiftNegative(JmPoint target, int x, int y) {
+ target.x -= x;
+ target.y -= y;
+ }
+
+ /**
+ * 位置を負方向に移動させる。
+ * @param target 移動対象
+ * @param delta 移動量
+ */
+ public static void shiftNegative(JmPoint target, JmPoint delta) {
+ target.x -= delta.x;
+ target.y -= delta.y;
+ }
+
+ /**
+ * 位置を正方向に移動させる。
+ * @param target 移動対象
+ * @param x X軸移動量
+ * @param y Y軸移動量
+ */
+ public static void shiftPositive(JmPoint target, int x, int y) {
+ target.x += x;
+ target.y += y;
+ }
+
+ /**
+ * 位置を正方向に移動させる。
+ * @param target 移動対象
+ * @param delta 移動量
+ */
+ public static void shiftPositive(JmPoint target, JmPoint delta) {
+ target.x += delta.x;
+ target.y += delta.y;
+ }
+
+ private JmPointUtil() {
+ }
+}
Modified: vesta/trunk/org.jiemamy.eclipse/pom.xml
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/pom.xml 2008-09-24 17:23:37 UTC (rev 1963)
+++ vesta/trunk/org.jiemamy.eclipse/pom.xml 2008-09-25 16:20:59 UTC (rev 1964)
@@ -172,13 +172,27 @@
<version>1.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>org.jiemamy.core</artifactId>
- <version>${project.version}</version>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>org.jiemamy.spec.core</artifactId>
+ <version>${project.version}</version>
<exclusions>
</exclusions>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>org.jiemamy.spec.event</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>org.jiemamy.spec.view</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.jiemamy.serializer</artifactId>
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java 2008-09-24 17:23:37 UTC (rev 1963)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractNodeEditPart.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -36,15 +36,15 @@
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.event.ObservableCollectionChangeListener;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent.Timing;
import org.jiemamy.eclipse.editor.editpart.DoubleClickSupport;
import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
import org.jiemamy.eclipse.editor.editpolicy.JmComponentEditPolicy;
import org.jiemamy.eclipse.editor.editpolicy.JmDirectEditPolicy;
import org.jiemamy.eclipse.editor.editpolicy.JmGraphicalNodeEditPolicy;
import org.jiemamy.eclipse.utils.EditorUtil;
+import org.jiemamy.spec.event.ObservableCollectionChangeEvent;
+import org.jiemamy.spec.event.ObservableCollectionChangeListener;
+import org.jiemamy.spec.event.ObservableCollectionChangeEvent.Timing;
import org.jiemamy.spec.geometory.JmRectangle;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.connection.AbstractConnectionModel;
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java 2008-09-24 17:23:37 UTC (rev 1963)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/AbstractRootEditPart.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -25,8 +25,8 @@
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
-import org.jiemamy.core.event.ObservableCollectionChangeListener;
import org.jiemamy.eclipse.utils.EditorUtil;
+import org.jiemamy.spec.event.ObservableCollectionChangeListener;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.node.AbstractNodeModel;
import org.jiemamy.spec.util.ModelChangeListener;
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java 2008-09-24 17:23:37 UTC (rev 1963)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -36,13 +36,13 @@
import org.seasar.framework.util.tiger.CollectionsUtil;
import org.seasar.framework.util.tiger.ReflectionUtil;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent;
-import org.jiemamy.core.event.ObservableCollectionChangeEvent.Timing;
import org.jiemamy.eclipse.JiemamyPlugin;
import org.jiemamy.eclipse.editor.editpart.EditDialogSupport;
import org.jiemamy.eclipse.editor.editpolicy.JmXYLayoutEditPolicy;
import org.jiemamy.eclipse.preference.ConnectionRouters;
import org.jiemamy.eclipse.preference.JiemamyPreference;
+import org.jiemamy.spec.event.ObservableCollectionChangeEvent;
+import org.jiemamy.spec.event.ObservableCollectionChangeEvent.Timing;
import org.jiemamy.spec.model.RootModel;
import org.jiemamy.spec.model.node.AbstractNodeModel;
import org.jiemamy.spec.util.ModelChangeEvent;
Modified: zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF 2008-09-24 17:23:37 UTC (rev 1963)
+++ zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF 2008-09-25 16:20:59 UTC (rev 1964)
@@ -15,7 +15,6 @@
org.jiemamy.spec.extension.composer,
org.jiemamy.spec.extension.dialect,
org.jiemamy.spec.extension.dialect.mapping,
- org.jiemamy.spec.geometory,
org.jiemamy.spec.model,
org.jiemamy.spec.model.connection,
org.jiemamy.spec.model.constraint,
Modified: zeus/trunk/org.jiemamy.spec.event/META-INF/MANIFEST.MF
===================================================================
--- zeus/trunk/org.jiemamy.spec.event/META-INF/MANIFEST.MF 2008-09-24 17:23:37 UTC (rev 1963)
+++ zeus/trunk/org.jiemamy.spec.event/META-INF/MANIFEST.MF 2008-09-25 16:20:59 UTC (rev 1964)
@@ -8,3 +8,5 @@
Eclipse-BuddyPolicy: registered
Eclipse-LazyStart: false
Require-Bundle: org.jiemamy.spec.core
+Export-Package: org.jiemamy.spec.event,
+ org.jiemamy.spec.event.collectionimpl
Modified: zeus/trunk/org.jiemamy.spec.view/META-INF/MANIFEST.MF
===================================================================
--- zeus/trunk/org.jiemamy.spec.view/META-INF/MANIFEST.MF 2008-09-24 17:23:37 UTC (rev 1963)
+++ zeus/trunk/org.jiemamy.spec.view/META-INF/MANIFEST.MF 2008-09-25 16:20:59 UTC (rev 1964)
@@ -8,5 +8,6 @@
Eclipse-BuddyPolicy: registered
Eclipse-LazyStart: false
Require-Bundle: org.jiemamy.spec.core
-Export-Package: org.jiemamy.spec.model.presentation,
+Export-Package: org.jiemamy.spec.geometory,
+ org.jiemamy.spec.model.presentation,
org.jiemamy.spec.view
Modified: zeus/trunk/org.jiemamy.spec.view/pom.xml
===================================================================
--- zeus/trunk/org.jiemamy.spec.view/pom.xml 2008-09-24 17:23:37 UTC (rev 1963)
+++ zeus/trunk/org.jiemamy.spec.view/pom.xml 2008-09-25 16:20:59 UTC (rev 1964)
@@ -142,6 +142,13 @@
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>org.jiemamy.spec.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
<reporting>
<plugins>
<plugin>
Added: zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmColor.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmColor.java (rev 0)
+++ zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmColor.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/06/09
+ *
+ * This file is part of Jiemamy-core.
+ *
+ * Licensed 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.jiemamy.spec.geometory;
+
+import java.io.Serializable;
+
+/**
+ * RGBによる色モデル。
+ *
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class JmColor implements Serializable {
+
+ /** 赤 */
+ public int red;
+
+ /** 緑 */
+ public int green;
+
+ /** 青 */
+ public int blue;
+
+
+ /**
+ * コンストラクタ。
+ * @category instance creation
+ */
+ public JmColor() {
+ }
+
+ /**
+ * コンストラクタ。
+ *
+ * @param red 赤（0-255）
+ * @param green 緑（0-255）
+ * @param blue 青（0-255）
+ */
+ public JmColor(int red, int green, int blue) {
+ this.red = red;
+ this.green = green;
+ this.blue = blue;
+ }
+}
Added: zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmPoint.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmPoint.java (rev 0)
+++ zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmPoint.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/06/09
+ *
+ * This file is part of Jiemamy-core.
+ *
+ * Licensed 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.jiemamy.spec.geometory;
+
+import java.io.Serializable;
+
+/**
+ * 座標モデル。
+ *
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class JmPoint implements Serializable {
+
+ /** X座標 */
+ public int x;
+
+ /** Y座標 */
+ public int y;
+
+
+ /**
+ * コンストラクタ。
+ * @category instance creation
+ */
+ public JmPoint() {
+ }
+
+ /**
+ * コンストラクタ。
+ *
+ * @param x X座標
+ * @param y Y座標
+ */
+ public JmPoint(int x, int y) {
+ this.x = x;
+ this.y = y;
+ }
+}
Added: zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmRectangle.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmRectangle.java (rev 0)
+++ zeus/trunk/org.jiemamy.spec.view/src/main/java/org/jiemamy/spec/geometory/JmRectangle.java 2008-09-25 16:20:59 UTC (rev 1964)
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/06/09
+ *
+ * This file is part of Jiemamy-core.
+ *
+ * Licensed 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.jiemamy.spec.geometory;
+
+import java.io.Serializable;
+
+/**
+ * 矩形モデル。
+ *
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class JmRectangle implements Serializable {
+
+ /** X座標 */
+ public int x;
+
+ /** Y座標 */
+ public int y;
+
+ /** 幅 */
+ public int width;
+
+ /** 高さ */
+ public int height;
+
+
+ /**
+ * コンストラクタ。
+ * @category instance creation
+ */
+ public JmRectangle() {
+ }
+
+ /**
+ * コンストラクタ。
+ * widthとheightは、デフォルト(-1)が設定される。
+ * @param x X座標
+ * @param y Y座標
+ * @category instance creation
+ */
+ public JmRectangle(int x, int y) {
+ this(x, y, -1, -1);
+ }
+
+ /**
+ * コンストラクタ。
+ * @param x X座標
+ * @param y Y座標
+ * @param width 幅
+ * @param height 高さ
+ * @category instance creation
+ */
+ public JmRectangle(int x, int y, int width, int height) {
+ this.x = x;
+ this.y = y;
+ this.width = width;
+ this.height = height;
+ }
+}