[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ff-cvs] fenfire ./Makefile org/fenfire/modules/pp/PPAct...
From: |
Tuomas J. Lukka |
Subject: |
[ff-cvs] fenfire ./Makefile org/fenfire/modules/pp/PPAct... |
Date: |
Thu, 21 Aug 2003 14:08:31 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/08/21 14:08:31
Modified files:
. : Makefile
org/fenfire/modules/pp: PPActionsImpl.java
org/fenfire/util: RDFUtil.java
Added files:
org/fenfire/structure: Canvas2D.java StructLink.java
Log message:
(arch commit) Refactoring - PPActionsIMpl -> single structural aspect
-oriented classes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/Makefile.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/structure/Canvas2D.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/structure/StructLink.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
Patches:
Index: fenfire/Makefile
diff -u fenfire/Makefile:1.37 fenfire/Makefile:1.38
--- fenfire/Makefile:1.37 Tue Aug 19 02:53:45 2003
+++ fenfire/Makefile Thu Aug 21 14:08:31 2003
@@ -14,7 +14,7 @@
LDLIB=LD_LIBRARY_PATH=../libvob/src/jni
-CLASSPATH=../storm-depends/cryptix-jce-provider.jar:../fenfire/build:../navidoc/CLASSES:../storm/CLASSES:../alph/CLASSES:../libvob/CLASSES:../fenfire-depends/libvob.jar:../fenfire-depends/jython.jar:../fenfire-depends/jena.jar:../fenfire-depends/icu4j.jar:../fenfire-depends/xerces.jar
+CLASSPATH=../storm-depends/cryptix-jce-provider.jar:./build:../navidoc/CLASSES:../storm/CLASSES:../alph/CLASSES:../libvob/CLASSES:../fenfire-depends/libvob.jar:../fenfire-depends/jython.jar:../fenfire-depends/jena.jar:../fenfire-depends/icu4j.jar:../fenfire-depends/xerces.jar
PYTHONPATH=-Dpython.path=../fenfire-depends/jythonlib.jar:../fenfire-depends/jython.jar:../fenfire-depends/pythonlib.jar:.:../libvob:../alph
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.36
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.37
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.36 Fri Aug 15
02:58:23 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java Thu Aug 21 14:08:31 2003
@@ -44,9 +44,10 @@
* doesn't return for me. Made both tests and
* FenPDF hang for me. Commented out the 'extends
* UnicastRemoteObject' for now. -benja
+ * @deprecated See org.fenfire.structure.StructLink and others
*/
public class PPActionsImpl /*extends UnicastRemoteObject*/ implements
PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.36 2003/08/15
06:58:23 tjl Exp $";
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.37 2003/08/21
18:08:31 tjl Exp $";
public static boolean dbg = false;
protected static void p(String s) { System.out.println("PPActionsImpl:
"+s); }
Index: fenfire/org/fenfire/util/RDFUtil.java
diff -u fenfire/org/fenfire/util/RDFUtil.java:1.17
fenfire/org/fenfire/util/RDFUtil.java:1.18
--- fenfire/org/fenfire/util/RDFUtil.java:1.17 Wed Aug 13 06:17:51 2003
+++ fenfire/org/fenfire/util/RDFUtil.java Thu Aug 21 14:08:31 2003
@@ -54,7 +54,7 @@
/** Check if node is the type which is asked.
*/
- static public boolean isNodeType(Graph graph, Object node, Object type) {
+ static public boolean isNodeType(ConstGraph graph, Object node, Object
type) {
if(dbg) p("Isnodetype: "+node+" "+type);
Iterator it = graph.findN_11X_Iter(node, RDF.type);
while(it.hasNext()) {
@@ -68,7 +68,7 @@
/** Get int attribute (from a literal).
*/
- static public int getInt(Graph graph, Object node, Object pre) {
+ static public int getInt(ConstGraph graph, Object node, Object pre) {
Literal lit = (Literal)graph.find1_11X(node, pre);
return Integer.parseInt(lit.getTextString() );
}
@@ -83,7 +83,7 @@
/** Get int attribute (from a literal).
*/
- static public float getFloat(Graph graph, Object node, Object pre) {
+ static public float getFloat(ConstGraph graph, Object node, Object pre) {
Literal lit = (Literal)graph.find1_11X(node, pre);
return Float.parseFloat(lit.getTextString() );
}
@@ -98,8 +98,9 @@
/** Special call for structure linked vocabulary to test if node is linked.
* @see STRUCTLINK
+ * @deprecated see Canvas2D
*/
- static public boolean isLinked(Graph graph, Object node) {
+ static public boolean isLinked(ConstGraph graph, Object node) {
Iterator it = graph.findN_11X_Iter(node, STRUCTLINK.linkedTo);
if (it.hasNext()) return true;
it = graph.findN_X11_Iter(STRUCTLINK.linkedTo, node);
@@ -109,8 +110,9 @@
/** Special call for structure linked vocabulary to test if node is linked
with node2.
* @see STRUCTLINK
+ * @deprecated see Canvas2D
*/
- static public boolean isLinkedWith(Graph graph, Object node, Object node2)
{
+ static public boolean isLinkedWith(ConstGraph graph, Object node, Object
node2) {
Iterator it = graph.findN_11X_Iter(node, STRUCTLINK.linkedTo);
if (it.hasNext() && node2 == it.next()) return true;
it = graph.findN_X11_Iter(STRUCTLINK.linkedTo, node);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [ff-cvs] fenfire ./Makefile org/fenfire/modules/pp/PPAct...,
Tuomas J. Lukka <=