changeset 2:221a0fd0a5d3

minor
author dwinter
date Tue, 13 Dec 2011 17:45:30 +0100
parents 7d7b9c6fbb36
children 6c8dac2c5214
files .classpath .project .settings/org.eclipse.wst.common.component .settings/org.eclipse.wst.common.project.facet.core.xml src/META-INF/MANIFEST.MF src/de/mpiwg/itgroup/triplestoremanager/owl/MetaDataHandler.java src/de/mpiwg/itgroup/triplestoremanager/owl/TripleStoreHandler.java
diffstat 7 files changed, 54 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/.classpath	Thu Dec 08 09:15:03 2011 +0100
+++ b/.classpath	Tue Dec 13 17:45:30 2011 +0100
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.15.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/openrdf-sesame-2.3.2-onejar.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jena.jar"/>
@@ -10,5 +9,16 @@
 	<classpathentry exported="true" kind="lib" path="lib/virtjdbc4.jar"/>
 	<classpathentry kind="lib" path="lib/protege-owl.jar"/>
 	<classpathentry kind="lib" path="lib/protege.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.utility"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/.project	Thu Dec 08 09:15:03 2011 +0100
+++ b/.project	Tue Dec 13 17:45:30 2011 +0100
@@ -6,13 +6,26 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 	<linkedResources>
 		<link>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.settings/org.eclipse.wst.common.component	Tue Dec 13 17:45:30 2011 +0100
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="TripleStoreManager">
+        <wb-resource deploy-path="/" source-path="/src"/>
+    </wb-module>
+</project-modules>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml	Tue Dec 13 17:45:30 2011 +0100
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Apache Tomcat v6.0"/>
+  <fixed facet="jst.utility"/>
+  <fixed facet="java"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/META-INF/MANIFEST.MF	Tue Dec 13 17:45:30 2011 +0100
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
--- a/src/de/mpiwg/itgroup/triplestoremanager/owl/MetaDataHandler.java	Thu Dec 08 09:15:03 2011 +0100
+++ b/src/de/mpiwg/itgroup/triplestoremanager/owl/MetaDataHandler.java	Tue Dec 13 17:45:30 2011 +0100
@@ -1,12 +1,10 @@
 package de.mpiwg.itgroup.triplestoremanager.owl;
 
 import java.io.File;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -15,31 +13,18 @@
 import org.apache.log4j.Logger;
 import org.openrdf.repository.RepositoryException;
 
-import com.hp.hpl.jena.graph.impl.LiteralLabel;
-import com.hp.hpl.jena.util.FileUtils;
-
 import de.mpiwg.itgroup.triplestoremanager.exceptions.TripleStoreHandlerException;
-
-
-
 import edu.stanford.smi.protege.exception.OntologyLoadException;
-import edu.stanford.smi.protege.storage.xml.XMLString;
 import edu.stanford.smi.protegex.owl.ProtegeOWL;
 import edu.stanford.smi.protegex.owl.jena.JenaOWLModel;
-import edu.stanford.smi.protegex.owl.jena.creator.OwlProjectFromUriCreator;
 import edu.stanford.smi.protegex.owl.model.OWLIndividual;
-import edu.stanford.smi.protegex.owl.model.OWLModel;
 import edu.stanford.smi.protegex.owl.model.OWLNamedClass;
 import edu.stanford.smi.protegex.owl.model.RDFProperty;
-import edu.stanford.smi.protegex.owl.model.RDFResource;
 import edu.stanford.smi.protegex.owl.model.RDFSNamedClass;
 import edu.stanford.smi.protegex.owl.model.impl.DefaultOWLNamedClass;
-import edu.stanford.smi.protegex.owl.model.impl.DefaultRDFProperty;
 import edu.stanford.smi.protegex.owl.model.impl.DefaultRDFSNamedClass;
 import edu.stanford.smi.protegex.owl.repository.RepositoryManager;
 import edu.stanford.smi.protegex.owl.repository.impl.LocalFolderRepository;
-import edu.stanford.smi.protegex.owl.ui.profiles.OWLProfiles;
-import edu.stanford.smi.protegex.owl.ui.profiles.ProfilesManager;
 
 public class MetaDataHandler {
 
--- a/src/de/mpiwg/itgroup/triplestoremanager/owl/TripleStoreHandler.java	Thu Dec 08 09:15:03 2011 +0100
+++ b/src/de/mpiwg/itgroup/triplestoremanager/owl/TripleStoreHandler.java	Tue Dec 13 17:45:30 2011 +0100
@@ -52,6 +52,7 @@
 		String pred;
 		Object obj;
 		String ctx;
+		Boolean optional=false;
 		
 		public String getSubj() {
 			return subj;
@@ -86,6 +87,11 @@
 			ctx=c;
 		}
 		
+		public Quadruple(String s, String p, String o, String c, boolean b) {
+			this(s,p,o,c);
+			optional=b;
+		}
+
 		public String toString(){
 			return String.format("%s  %s  %s  %s.", subj,pred,obj,ctx);
 		}
@@ -98,12 +104,19 @@
 		String pred;
 		Object obj;
 		String ctx;
+		Boolean optional=false;
+		
 			
 		public LiteralQuadruple(String s, String p, String o,String c){
 			super(s,p,o,c);
 			
 			
 		}
+
+		public LiteralQuadruple(String s, String p,
+				String o, String c, boolean b) {
+			super(s,p,o,c,b);
+		}
 		
 	}
 	public static String ONTOLOGY_NS="http://ontologies.mpiwg-berlin.mpg.de/authorities/namedIdentities/";