Author: mir
Date: Mon Dec 14 15:05:15 2009
New Revision: 890359
URL: http://svn.apache.org/viewvc?rev=890359&view=rev
Log:
CLEREZZA-23: removed removed() from MetaDataGenerator interface. Modified
removed from DiscoBitsHandler
Modified:
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/AbstractDiscobitsHandler.java
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsHandler.java
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/MetaDataGenerator.java
Modified:
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/AbstractDiscobitsHandler.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/AbstractDiscobitsHandler.java?rev=890359&r1=890358&r2=890359&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/AbstractDiscobitsHandler.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/AbstractDiscobitsHandler.java
Mon Dec 14 15:05:15 2009
@@ -27,7 +27,6 @@
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Resource;
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.TypedLiteral;
import org.apache.clerezza.rdf.core.UriRef;
@@ -48,7 +47,7 @@
protected abstract MGraph getMGraph();
/**
- * A <code>Set</code> containing <code>MetaDataGenerator</code> s to be
used
+ * A <code>Set</code> containing <code>MetaDataGenerator</code>s to be
used
* to add meta data to data putted by the handler.
*
* @return a Set containing meta data generators
@@ -73,8 +72,7 @@
@Override
public void remove(NonLiteral node) {
- MGraph mGraph = getMGraph();
- removeMetaData(node, mGraph);
+ MGraph mGraph = getMGraph();
Iterator<Triple> properties = mGraph.filter(node, null, null);
//copying properties to set, as we're modifying underlying graph
Set<Triple> propertiesSet = new HashSet<Triple>();
@@ -87,28 +85,19 @@
UriRef predicate = triple.getPredicate();
if (predicate.equals(DISCOBITS.contains)) {
try {
- GraphNode graphNode = new
GraphNode((NonLiteral)triple.getObject(), mGraph);
+ GraphNode containedNode = new
GraphNode((NonLiteral)triple.getObject(), mGraph);
//The following includes triple
- graphNode.deleteNodeContext();
+ containedNode.deleteNodeContext();
} catch (ClassCastException e) {
throw new RuntimeException("The value
of "+predicate+" is expected not to be a literal");
}
//as some other properties of node could have
been in the context of the object
remove(node);
return;
- }
- if
(predicate.getUnicodeString().startsWith("http://discobits.org/ontology#";)) {
- mGraph.remove(triple);
- continue;
- }
- if (predicate.equals(RDF.type)) {
- Resource object = triple.getObject();
- if ((object instanceof UriRef)
- &&
((UriRef)object).getUnicodeString().startsWith("http://discobits.org/ontology#";))
{
- mGraph.remove(triple);
- }
- }
+ }
}
+ GraphNode graphNode = new GraphNode(node, mGraph);
+ graphNode.deleteNodeContext();
}
@Override
@@ -132,17 +121,4 @@
}
return MediaType.valueOf(infoDiscobit.getContentType());
}
-
- private void removeMetaData(NonLiteral node, MGraph mGraph) {
- GraphNode graphNode = new GraphNode(node, mGraph);
- Iterator<Resource> mediaTypes =
graphNode.getObjects(DISCOBITS.mediaType);
- MediaType mediaType;
- if (mediaTypes.hasNext()) {
- String mediaTypeStr =
LiteralFactory.getInstance().createObject(String.class,
- (TypedLiteral)mediaTypes.next());
- mediaType = MediaType.valueOf(mediaTypeStr);
- } else {
- return;
- }
- }
}
Modified:
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsHandler.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsHandler.java?rev=890359&r1=890358&r2=890359&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsHandler.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsHandler.java
Mon Dec 14 15:05:15 2009
@@ -43,7 +43,8 @@
byte[] data);
/**
- * removes InfoDiscoBits (aka binary contents) and other DiscoBits.
+ * Removes InfoDiscoBits (aka binary contents), other DiscoBits and
+ * the context of the specified node.
*
* @param node
*/
Modified:
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/MetaDataGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/MetaDataGenerator.java?rev=890359&r1=890358&r2=890359&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/MetaDataGenerator.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/MetaDataGenerator.java
Mon Dec 14 15:05:15 2009
@@ -31,17 +31,12 @@
public interface MetaDataGenerator {
/**
- * Generates meta data about the specified bytes depending its
mediaType.
+ * Generates meta data about the specified bytes depending on its
mediaType.
* The meta data will be added to the specified graph node.
* @param node The graph node to which the meta data will be added
* @param data The data from which the meta data is generated
* @param mediaType The media type of the data
*/
public void generate(GraphNode node, byte[] data, MediaType mediaType);
-
- /**
- * Removes the meta data of the specified graph node.
- * @param node The graph node whose meta data should be removed.
- */
- public void remove(GraphNode node, MediaType mediaType);
+
}
