Feature/gephi 10 1

README-plugin.md

@@ -202,7 +202,7 @@ graphModel = Lookup.getDefault().lookup(GraphController).getModel()
 fa2.setGraphModel(graphModel)
 fa2.setAdjustSizes(True) # To prevent overlap
 
-print "executing layout"
+print("executing layout")
 # Run the layout.
 fa2.initAlgo()
 for i in range(5000):

modules/SemanticWebImport/README.md

@@ -0,0 +1,4 @@
+## SemanticWebImport
+
+This README supports Markdown, see [syntax](https://help.github.com/articles/markdown-basics/)
+

modules/SemanticWebImport/pom.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.gephi</groupId>
-		<artifactId>gephi-plugin-parent</artifactId>
-		<version>0.10.0</version>
-	</parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>gephi-plugin-parent</artifactId>
+        <groupId>org.gephi</groupId>
+        <version>0.10.0</version>
+    </parent>
 
-	<groupId>fr.inria.edelweiss</groupId>
-	<artifactId>semantic</artifactId>
-	<version>1.4.0</version>
-	<packaging>nbm</packaging>
+    <groupId>fr.inria.corese</groupId>
+    <artifactId>semantic</artifactId>
+    <version>1.5.0</version>
+    <packaging>nbm</packaging>
 
-	<name>SemanticWebImport</name>
+    <name>SemanticWebImport</name>
 
 	<dependencies>
 		<dependency>
@@ -78,12 +78,12 @@
 		<dependency>
 			<groupId>fr.inria.corese</groupId>
 			<artifactId>corese-core</artifactId>
-			<version>4.4.0</version>
+			<version>4.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>fr.inria.corese</groupId>
 			<artifactId>corese-gui</artifactId>
-			<version>4.4.0</version>
+			<version>4.5.0</version>
 		 <type>jar</type>
 		</dependency>
 		<dependency>
@@ -109,12 +109,7 @@
 			<groupId>org.netbeans.api</groupId>
 			<artifactId>org-openide-util</artifactId>
 		</dependency>
-<!--	 <dependency>
-	  <groupId>fr.inria.wimmics</groupId>
-	  <artifactId>SparqlSoapLib</artifactId>
-	  <version>1.0.0</version>
-	 </dependency>-->
-	</dependencies> 
+	</dependencies>
  <build>
 		<plugins>
 			<plugin>

modules/SemanticWebImport/src/main/java/fr/inria/edelweiss/semantic/SemanticWebImportMainWindowTopComponent.java

@@ -881,7 +881,7 @@ private void refreshActiveSparqlDriver() {
                 String panelClassName = sparqlDriver.getParameters().getPanelClassName();
                 ClassLoader loader = Lookup.getDefault().lookup(ClassLoader.class);
                 Constructor<?> constructor = loader.loadClass(panelClassName).getDeclaredConstructor(sparqlDriver.getParameters().getClass());
-                DriverParametersPanel newPanel = (DriverParametersPanel) constructor.newInstance(sparqlDriver.getParameters());
+                DriverParametersPanel<SparqlDriverParameters> newPanel = (DriverParametersPanel<SparqlDriverParameters>) constructor.newInstance(sparqlDriver.getParameters());
                 if (newPanel != null) {
                     newPanel.setParameters(parameters);
                     parametersPanel.add(newPanel);
@@ -890,7 +890,7 @@ private void refreshActiveSparqlDriver() {
                 }
 
                 parameters.addObserver(newPanel);
-                parameters.addObserver(sparqlDriver);
+//                parameters.addObserver(sparqlDriver);
             } catch (IllegalArgumentException ex) {
                 Exceptions.printStackTrace(ex);
             } catch (InvocationTargetException ex) {

modules/SemanticWebImport/src/main/java/fr/inria/edelweiss/semantic/importer/SemanticWebImportParser.java

@@ -63,7 +63,7 @@ public SemanticWebImportParser(RequestParameters requests) {
      * @param properties Parameters to use.
      * @sa waitEndpopulateRDFGraph
      */
-    public final void populateRDFGraph(SparqlDriver driverUsed, Properties properties, LongTaskListener listener) {
+    public final void populateRDFGraph(SparqlDriver<?> driverUsed, Properties properties, LongTaskListener listener) {
         this.listener = listener;
         boolean resetWorkspace = Boolean.parseBoolean(properties.getProperty(PluginProperties.RESET_WORKSPACE.getValue(), "false"));
         boolean postProcessing = Boolean.parseBoolean(properties.getProperty(PluginProperties.POST_PROCESSING.getValue(), "false"));

modules/SemanticWebImport/src/main/java/fr/inria/edelweiss/semantic/statistics/gui/TreeTableModelAdapter.java

@@ -92,7 +92,7 @@ public String getColumnName(int column) {
 	return treeTableModel.getColumnName(column);
     }
 
-    public Class getColumnClass(int column) {
+    public Class<?> getColumnClass(int column) {
 	return treeTableModel.getColumnClass(column);
     }
 

modules/SemanticWebImport/src/main/java/fr/inria/edelweiss/semantic/statistics/gui/TypeTreeModel.java

@@ -29,7 +29,7 @@ public TypeTreeModel(TypeTreeNode root) {
     // Some convenience methods.
     //
     protected TypeTreeNode[] getChildren(TypeTreeNode node) {
-        return ((TypeTreeNode) node).getChildren();
+        return node.getChildren();
     }
 
     //
@@ -71,7 +71,7 @@ public String getColumnName(int column) {
     }
 
     @Override
-    public Class getColumnClass(int column) {
+    public Class<?> getColumnClass(int column) {
         return cTypes[column];
     }
 

modules/SemanticWebImport/src/main/java/fr/inria/edelweiss/sparql/SparqlDriver.java

@@ -14,7 +14,7 @@
 /**
  * Responsible for applying a SPARQL request on data which can be local or remote.
  */
-public abstract class SparqlDriver<P extends SparqlDriverParameters> implements SparqlRequester, Observer {
+public abstract class SparqlDriver<P extends SparqlDriverParameters> implements SparqlRequester{
 
     private static final Logger logger = Logger.getLogger(SparqlDriver.class.getName());
     private P parameters;

modules/SemanticWebImport/src/main/java/fr/inria/edelweiss/sparql/corese/CoreseDriver.java

@@ -188,8 +188,5 @@ public String getDisplayName() {
         return "Local Driver - Corese";
     }
 
-    @Override
-    public void update(Observable o, Object arg) {
 
-    }
 }

modules/SemanticWebImport/src/main/java/fr/inria/edelweiss/sparql/restdriver/SparqlRestEndPointDriver.java

@@ -110,7 +110,4 @@ public String[][] selectOnGraph(String request) {
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
-	@Override
-	public void update(Observable o, Object arg) {
-	}
 }

modules/SemanticWebImport/src/main/nbm/manifest.mf

@@ -1,2 +1,5 @@
 Manifest-Version: 1.0
-OpenIDE-Module-Localizing-Bundle: fr/inria/edelweiss/semantic/Bundle.properties
+OpenIDE-Module-Name: SemanticWebImport
+OpenIDE-Module-Short-Description: Allow to configure the view of rdf and rdfs files.
+OpenIDE-Module-Long-Description: The purpose of this plugin is:
+OpenIDE-Module-Display-Category: Import

modules/SemanticWebImport/src/main/resources/fr/inria/edelweiss/examples/autolayout.py

@@ -34,7 +34,7 @@
 fa2.setGraphModel(graphModel)
 fa2.setAdjustSizes(True) # To prevent overlap
 
-print "executing layout"
+print("executing layout")
 # Run the layout.
 fa2.initAlgo()
 for i in range(5000):

modules/SemanticWebImport/src/main/resources/fr/inria/edelweiss/examples/autolayout3D.py

@@ -34,14 +34,14 @@
 fa2.setGraphModel(graphModel)
 fa2.setAdjustSizes(True) # To prevent overlap
 
-print "setting z coordinates"
+print("setting z coordinates")
 ### Setting a random z coordinate on each node
 import random
 graph = graphModel.getGraph()
 for n in graph.getNodes():
   n.getNodeData().setZ(graph.getDegree(n)*10)
 
-print "executing layout"
+print("executing layout")
 # Run the layout.
 fa2.initAlgo()
 for i in range(5000):

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.gephi</groupId>
     <artifactId>gephi-plugins</artifactId>
-    <version>0.10.1</version>
+    <version>0.10.0</version>
     <packaging>pom</packaging>
 
     <name>gephi-plugins</name>
@@ -18,7 +18,7 @@
     <!-- Properties -->
     <properties>
         <!-- Version of Gephi building plugins against. Plugins with anterior versions will be ignored -->
-        <gephi.version>0.10.1</gephi.version>
+        <gephi.version>0.10.0</gephi.version>
         <clusters.path>${project.build.directory}/plugins_clusters</clusters.path>
         <github.global.server>github</github.global.server>
     </properties>
@@ -77,22 +77,6 @@
         <!-- Plugins installed with versions -->
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.netbeans.utilities</groupId>
-                    <artifactId>nb-repository-plugin</artifactId>
-                    <configuration>
-                        <netbeansInstallDirectory>${project.build.directory}/gephi-${gephi.version}</netbeansInstallDirectory>
-                        <netbeansNbmDirectory>/Users/edemairy/Developpement/update-semanticwebimport</netbeansNbmDirectory>
-                        <!--                        <forcedVersion>a.b.c</forcedVersion> -->
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>11</source>
-                        <target>11</target>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
@@ -101,7 +85,7 @@
                 <plugin>
                     <groupId>org.apache.netbeans.utilities</groupId>
                     <artifactId>nbm-maven-plugin</artifactId>
-                    <version>4.8</version>
+                    <version>4.5</version>
                     <extensions>true</extensions>
                 </plugin>
                 <plugin>
@@ -116,7 +100,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        
+
         <!-- Plugins -->
         <plugins>
             <!-- Configure gephi-maven-plugin -->
@@ -142,7 +126,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <!-- Unpack the localization dependency -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -166,7 +150,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <!-- NBM Plugin -->
             <plugin>
                 <groupId>org.apache.netbeans.utilities</groupId>