From 6d7f3202466601c447128a2ace16f41db904ff1f Mon Sep 17 00:00:00 2001 From: Antonio Garcia-Dominguez Date: Mon, 3 Feb 2025 10:51:23 +0000 Subject: [PATCH] emc.rdf.dt: code cleanup --- .../epsilon/emc/rdf/dt/EclipseMOF2RDFModel.java | 2 -- .../epsilon/emc/rdf/dt/EclipseProtocolParser.java | 15 ++++++++++----- .../epsilon/emc/rdf/dt/EclipseRDFModel.java | 4 +--- .../rdf/dt/MOF2RDFModelConfigurationDialog.java | 1 + 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseMOF2RDFModel.java b/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseMOF2RDFModel.java index cdb3c1d..26aefd6 100644 --- a/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseMOF2RDFModel.java +++ b/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseMOF2RDFModel.java @@ -30,7 +30,5 @@ protected void loadModel() throws EolModelLoadingException { // Call the RDFModel load as normal, no platform URLs are passed to Jena super.loadModel(); } - - } diff --git a/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseProtocolParser.java b/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseProtocolParser.java index b9c96e3..b6983d1 100644 --- a/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseProtocolParser.java +++ b/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseProtocolParser.java @@ -24,16 +24,21 @@ private EclipseProtocolParser() { // This class is not meant to be instantiated } - // Pushes a list of URLs through a process to turn any Platform:/ into File:/ - static public void processEclipsePlatformUrlsToFileUrls(List urlList) throws IOException { + /** + * Transforms any {@code platform:/} URLs to {@code file:/} URLs. + * Does not change any other URLs. + */ + public static void processEclipsePlatformUrlsToFileUrls(List urlList) throws IOException { for (int i = 0; i < urlList.size(); i++) { urlList.set(i, processPlatformURLtoFileUrl(urlList.get(i))); } } - // A File:/ URL or relative path starting '/' or '.' is unchanged by this process, Platform:/ URLs become File:/ URLs - // Attempts to resolve a String to a URI and then URL, then gets the File:/ URL and returns it - static public String processPlatformURLtoFileUrl(String urlString) throws IOException { + /** + * Transforms a {@code platform:/} URL into a {@code file:/} URL. + * Does not change any other URLs. + */ + public static String processPlatformURLtoFileUrl(String urlString) throws IOException { if (!urlString.startsWith("platform:")) { return urlString; } diff --git a/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseRDFModel.java b/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseRDFModel.java index 71789dd..99305e4 100644 --- a/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseRDFModel.java +++ b/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/EclipseRDFModel.java @@ -16,7 +16,7 @@ import org.eclipse.epsilon.eol.exceptions.models.EolModelLoadingException; public class EclipseRDFModel extends RDFModel { - + @Override protected void loadModel() throws EolModelLoadingException { // Change any platform:/ URLs to file:/ URLs in these lists... @@ -30,7 +30,5 @@ protected void loadModel() throws EolModelLoadingException { // Call the RDFModel load as normal, no platform URLs are passed to Jena super.loadModel(); } - - } diff --git a/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/MOF2RDFModelConfigurationDialog.java b/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/MOF2RDFModelConfigurationDialog.java index 549f6c6..1d880c4 100644 --- a/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/MOF2RDFModelConfigurationDialog.java +++ b/bundles/org.eclipse.epsilon.emc.rdf.dt/src/org/eclipse/epsilon/emc/rdf/dt/MOF2RDFModelConfigurationDialog.java @@ -23,4 +23,5 @@ protected String getModelName() { protected String getModelType() { return "MOF2RDF"; } + }