git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit/trunk@652 7cac0...

diff --git a/utils/java3d/.classpath b/utils/java3d/.classpath
index a977672..993287a 100644 (file)
--- a/utils/java3d/.classpath
+++ b/utils/java3d/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" path=""/>\r
+       <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/NyARToolKit"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/NyARToolkit.utils.jmf"/>\r
@@ -8,5 +8,5 @@
        <classpathentry kind="lib" path="C:/Program Files (x86)/Java/Java3D/1.5.1/lib/ext/j3dutils.jar"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/Java/Java3D/1.5.1/lib/ext/vecmath.jar"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/JMF2.1.1e/lib/jmf.jar"/>\r
-       <classpathentry kind="output" path=""/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARParam.java b/utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARParam.java
similarity index 100%
rename from utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARParam.java
rename to utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARParam.java

diff --git a/utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java b/utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java
similarity index 100%
rename from utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java
rename to utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/J3dNyARRaster_RGB.java

diff --git a/utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorHolder.java b/utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorHolder.java
similarity index 100%
rename from utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorHolder.java
rename to utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorHolder.java

diff --git a/utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorListener.java b/utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorListener.java
similarity index 100%
rename from utils/java3d/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorListener.java
rename to utils/java3d/src/jp/nyatla/nyartoolkit/java3d/utils/NyARSingleMarkerBehaviorListener.java

diff --git a/utils/jmf/.classpath b/utils/jmf/.classpath
index 01e0575..2ce427d 100644 (file)
--- a/utils/jmf/.classpath
+++ b/utils/jmf/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" path=""/>\r
+       <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/NyARToolKit"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/JMF2.1.1e/lib/jmf.jar"/>\r
-       <classpathentry kind="output" path=""/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDevice.java b/utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDevice.java
similarity index 100%
rename from utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDevice.java
rename to utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDevice.java

diff --git a/utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDeviceList.java b/utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDeviceList.java
similarity index 100%
rename from utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDeviceList.java
rename to utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureDeviceList.java

diff --git a/utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureListener.java b/utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureListener.java
similarity index 100%
rename from utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureListener.java
rename to utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfCaptureListener.java

diff --git a/utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfNyARRaster_RGB.java b/utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfNyARRaster_RGB.java
similarity index 100%
rename from utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfNyARRaster_RGB.java
rename to utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/JmfNyARRaster_RGB.java

diff --git a/utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/MonitorCDS.java b/utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/MonitorCDS.java
similarity index 100%
rename from utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/MonitorCDS.java
rename to utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/MonitorCDS.java

diff --git a/utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/MonitorStream.java b/utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/MonitorStream.java
similarity index 100%
rename from utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/MonitorStream.java
rename to utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/MonitorStream.java

diff --git a/utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/sample/JmfCaptureTest.java b/utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/sample/JmfCaptureTest.java
similarity index 100%
rename from utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/sample/JmfCaptureTest.java
rename to utils/jmf/src/jp/nyatla/nyartoolkit/jmf/utils/sample/JmfCaptureTest.java

diff --git a/utils/jogl/.classpath b/utils/jogl/.classpath
index 5345587..c7c1b78 100644 (file)
--- a/utils/jogl/.classpath
+++ b/utils/jogl/.classpath
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" path=""/>\r
+       <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/NyARToolKit"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/NyARToolkit.utils.jmf"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/Java/jre6/lib/ext/gluegen-rt.jar"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/Java/jre6/lib/ext/jogl.jar"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/JMF2.1.1e/lib/jmf.jar"/>\r
-       <classpathentry kind="output" path=""/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java b/utils/jogl/src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
similarity index 100%
rename from utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
rename to utils/jogl/src/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java

diff --git a/utils/qt/.classpath b/utils/qt/.classpath
index 0ada1cd..a1c8bf7 100644 (file)
--- a/utils/qt/.classpath
+++ b/utils/qt/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" path=""/>\r
+       <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/NyARToolKit"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/JMF2.1.1e/lib/jmf.jar"/>\r
        <classpathentry kind="lib" path="C:/Program Files (x86)/Java/jre6/lib/ext/QTJava.zip"/>\r
-       <classpathentry kind="output" path=""/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtCameraCapture.java b/utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtCameraCapture.java
similarity index 100%
rename from utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtCameraCapture.java
rename to utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtCameraCapture.java

diff --git a/utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtCaptureListener.java b/utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtCaptureListener.java
similarity index 100%
rename from utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtCaptureListener.java
rename to utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtCaptureListener.java

diff --git a/utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtNyARRaster_RGB.java b/utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtNyARRaster_RGB.java
similarity index 100%
rename from utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtNyARRaster_RGB.java
rename to utils/qt/src/jp/nyatla/nyartoolkit/qt/utils/QtNyARRaster_RGB.java