From 16beb551eaeeb0315b2e142b14d35779d7d56764 Mon Sep 17 00:00:00 2001 From: reger Date: Sat, 7 Jan 2017 18:24:29 +0100 Subject: [PATCH] fix DC.Elements namespace in DublinCore vocabulary class delete redundant (unused) DCElements. --- .../yacy/cora/lod/vocabulary/DCElements.java | 76 ------------------- .../yacy/cora/lod/vocabulary/DublinCore.java | 12 ++- 2 files changed, 9 insertions(+), 79 deletions(-) delete mode 100644 source/net/yacy/cora/lod/vocabulary/DCElements.java diff --git a/source/net/yacy/cora/lod/vocabulary/DCElements.java b/source/net/yacy/cora/lod/vocabulary/DCElements.java deleted file mode 100644 index 2a6a0b8a9..000000000 --- a/source/net/yacy/cora/lod/vocabulary/DCElements.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * DublinCore - * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net - * - * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ - * $LastChangedRevision: 7653 $ - * $LastChangedBy: orbiter $ - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program in the file lgpl21.txt - * If not, see . - */ - - -package net.yacy.cora.lod.vocabulary; - -import java.util.Set; - -import net.yacy.cora.lod.Literal; -import net.yacy.cora.lod.Vocabulary; - -public enum DCElements implements Vocabulary { - - - creator, - date, - description, - subject, - title; - - public final static String IDENTIFIER = "http://purl.org/dc/elements/1.1/"; - public final static String PREFIX = "dc"; - - private final String predicate, uriref; - - private DCElements() { - this.predicate = IDENTIFIER + this.name().toLowerCase(); - this.uriref = PREFIX + ':' + this.name().toLowerCase(); - } - - @Override - public String getNamespace() { - return IDENTIFIER; - } - - @Override - public String getNamespacePrefix() { - return PREFIX; - } - - @Override - public Set getLiterals() { - return null; - } - - @Override - public String getPredicate() { - return this.predicate; - } - - @Override - public String getURIref() { - return this.uriref; - } -} diff --git a/source/net/yacy/cora/lod/vocabulary/DublinCore.java b/source/net/yacy/cora/lod/vocabulary/DublinCore.java index 0c29f4515..0f8a54401 100644 --- a/source/net/yacy/cora/lod/vocabulary/DublinCore.java +++ b/source/net/yacy/cora/lod/vocabulary/DublinCore.java @@ -30,6 +30,12 @@ import java.util.Set; import net.yacy.cora.lod.Literal; import net.yacy.cora.lod.Vocabulary; +/** + * Dublin Core Metadata Element Set, Version 1.1 + * http://www.dublincore.org/documents/dces/ The Dublin Core Metadata Element + * Set is a vocabulary of fifteen properties for use in resource description. + * + */ public enum DublinCore implements Vocabulary { Contributor, @@ -48,19 +54,19 @@ public enum DublinCore implements Vocabulary { Title, Type; - public final static String IDENTIFIER = "http://dublincore.org/documents/2010/10/11/dces/"; + public final static String NAMESPACE = "http://purl.org/dc/elements/1.1/"; public final static String PREFIX = "dc"; private final String predicate, uriref; private DublinCore() { - this.predicate = IDENTIFIER + this.name().toLowerCase(); + this.predicate = NAMESPACE + this.name().toLowerCase(); this.uriref = PREFIX + ':' + this.name().toLowerCase(); } @Override public String getNamespace() { - return IDENTIFIER; + return NAMESPACE; } @Override