[ISSUE locationtech#678] fixes catalog search NPE for SHP

resources, if the namespace of the type is null Change-Id: I255a9f14a3999e7286570dcf50ed0014b524d458 Signed-off-by: Frank Gasdorf <[email protected]>
fgdrf · Feb 7, 2022 · 27e7579 · 27e7579
1 parent f5934f3
commit 27e7579
Show file tree

Hide file tree

Showing 24 changed files with 1,318 additions and 525 deletions.
diff --git a/...ntech.udig.catalog.db2/src/org/locationtech/udig/catalog/internal/db2/DB2GeoResource.java b/...ntech.udig.catalog.db2/src/org/locationtech/udig/catalog/internal/db2/DB2GeoResource.java
@@ -199,7 +199,7 @@ class DB2GeoResourceInfo extends IGeoResourceInfo {
 
             icon = Glyph.icon(ft);
             keywords = new String[] { "db2", //$NON-NLS-1$
-                    ft.getName().getLocalPart(), ft.getName().getNamespaceURI() };
+                    ft.getName().getLocalPart(), ft.getName().getURI() };
         }
 
         @Override

diff --git a/plugins/org.locationtech.udig.catalog.shp.tests/.classpath b/plugins/org.locationtech.udig.catalog.shp.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.locationtech.udig.catalog.shp.tests/.project b/plugins/org.locationtech.udig.catalog.shp.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.locationtech.udig.catalog.shp.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.locationtech.udig.catalog.shp.tests/LICENSE.txt b/plugins/org.locationtech.udig.catalog.shp.tests/LICENSE.txt
@@ -0,0 +1,8 @@
+uDig - User Friendly Desktop Internet GIS client
+http://udig.refractions.net
+(C) 2004-2012, Refractions Research Inc.
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+(http://www.eclipse.org/legal/epl-v10.html), and Refractions BSD
+License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html).
diff --git a/plugins/org.locationtech.udig.catalog.shp.tests/META-INF/MANIFEST.MF b/plugins/org.locationtech.udig.catalog.shp.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shp Test Plug-in
+Bundle-SymbolicName: org.locationtech.udig.catalog.shp.tests;singleton:=true
+Bundle-Version: 2.3.0.qualifier
+Bundle-Vendor: udig.refractions.net
+Require-Bundle: org.eclipse.core.runtime,
+ org.mockito;bundle-version="2.23.0",
+ net.bytebuddy.byte-buddy;bundle-version="1.9.0",
+ net.bytebuddy.byte-buddy-agent;bundle-version="1.9.0",
+ org.junit;bundle-version="4.12.0"
+Fragment-Host: org.locationtech.udig.catalog.shp
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.locationtech.udig.catalog.shp.tests/about.html b/plugins/org.locationtech.udig.catalog.shp.tests/about.html
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About This Content</title>
+<style type="text/css">
+body {
+        size: 8.5in 11.0in;
+        margin: 1cm 2cm 1cm 2cm;
+        tab-interval: 1cm;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 9pt;
+        color: #555;
+      }
+      p {  	
+        margin:0;
+        padding:5px 0 5px 0;
+      }
+      ul {
+         margin-top:5px;
+         margin-bottom:5px;
+         margin-left:0px;
+         padding-left:1.5em;
+      }
+      h2 {
+         font-family:Arial, Helvetica, sans-serif;
+         font-weight:100;
+         line-height:1.1em;
+         color:#000000;
+         margin:0;
+         padding:10px 0;
+         font-size:160%;
+         padding-bottom:9px;
+      }
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>About This Content</h2>
+<p>
+Sept 25, 2012</p>
+
+<h2>License</h2>
+
+<p>Refractions Research makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+<a href="http://udig.refractions.net/files/epl-v10.html">Eclipse Public License Version 1.0
+("EPL")</a>, and the <a href="http://udig.refractions.net/files/bsd3-v10.html">Refractions BSD
+License Version 1.0</a> ("BSD"). For purposes of the EPL and BSD, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Refractions Research, the Content is being
+redistributed by another party ("Redistributor") and different terms and conditions may apply to
+your use of any object code in the Content. Check the Redistributor's license that was provided with
+the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below,
+the terms and conditions of the EPL still apply to any source code in the Content and such source
+code may be obtained at http://github.com/udig .</p>
+
+</body>
+
+</html>
diff --git a/plugins/org.locationtech.udig.catalog.shp.tests/bsd3-v10.html b/plugins/org.locationtech.udig.catalog.shp.tests/bsd3-v10.html
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html>
+  <header>
+    <title>Refractions BSD 3 Clause License (BSD)</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <style type="text/css">
+      body {
+        size: 8.5in 11.0in;
+        margin: 1cm 2cm 1cm 2cm;
+        tab-interval: 1cm;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 9pt;
+        color: #555;
+      }
+      p {  	
+        margin:0;
+        padding:5px 0 5px 0;
+      }
+      ul {
+         margin-top:5px;
+         margin-bottom:5px;
+         margin-left:0px;
+         padding-left:1.5em;
+      }
+      h1 {
+         font-family:Arial, Helvetica, sans-serif;
+         font-weight:100;
+         line-height:1.1em;
+         color:#000000;
+         margin:0;
+         padding:10px 0;
+         font-size:160%;
+         padding-bottom:9px;
+      }
+      </style>
+  </header>
+<body>
+<h1>Refractions BSD 3 Clause License (BSD) - v 1.0</h1>
+<p>
+  Copyright (c) 2012, Refractions Research Inc.<br/>
+  All rights reserved.</p>
+
+<p>
+  Redistribution and use in source and binary forms, with or without modification, are permitted
+  provided that the following conditions are met:
+</p>
+<ul>
+  <li>Redistributions of source code must retain the above copyright notice, this list of conditions
+      and the following disclaimer.</li>
+  <li>Redistributions in binary form must reproduce the above copyright notice, this list of
+      conditions and the following disclaimer in the documentation and/or other materials provided
+      with the distribution.</li>
+  <li>Neither the name of the Refractions Research nor the names of its contributors may be used to
+      endorse or promote products derived from this software without specific prior written
+      permission.</li>
+</ul>
+<p>
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+</body>
diff --git a/plugins/org.locationtech.udig.catalog.shp.tests/build.properties b/plugins/org.locationtech.udig.catalog.shp.tests/build.properties
@@ -0,0 +1,8 @@
+bin.includes = META-INF/,\
+               .,\
+               LICENSE.txt,\
+               epl-v10.html,\
+               bsd3-v10.html,\
+               about.html
+source.. = src/
+output.. = bin/