Skip to content

Commit 7518664

Browse files
fgdrffgdrf
committed
[ISSUE #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]>
1 parent f5934f3 commit 7518664

File tree

24 files changed

+1318
-525
lines changed

24 files changed

+1318
-525
lines changed

‎plugins/org.locationtech.udig.catalog.db2/src/org/locationtech/udig/catalog/internal/db2/DB2GeoResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ class DB2GeoResourceInfo extends IGeoResourceInfo {
199199

200200
icon = Glyph.icon(ft);
201201
keywords = new String[] { "db2", //$NON-NLS-1$
202-
ft.getName().getLocalPart(), ft.getName().getNamespaceURI() };
202+
ft.getName().getLocalPart(), ft.getName().getURI() };
203203
}
204204

205205
@Override

‎plugins/org.locationtech.udig.catalog.shp.tests/.classpath‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
4+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5+
<classpathentry kind="src" path="src/"/>
6+
<classpathentry kind="output" path="bin"/>
7+
</classpath>

‎plugins/org.locationtech.udig.catalog.shp.tests/.project‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.locationtech.udig.catalog.shp.tests</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.pde.ManifestBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.pde.SchemaBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
</buildSpec>
24+
<natures>
25+
<nature>org.eclipse.pde.PluginNature</nature>
26+
<nature>org.eclipse.jdt.core.javanature</nature>
27+
</natures>
28+
</projectDescription>

‎plugins/org.locationtech.udig.catalog.shp.tests/LICENSE.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
uDig - User Friendly Desktop Internet GIS client
2+
http://udig.refractions.net
3+
(C) 2004-2012, Refractions Research Inc.
4+
5+
All rights reserved. This program and the accompanying materials
6+
are made available under the terms of the Eclipse Public License v1.0
7+
(http://www.eclipse.org/legal/epl-v10.html), and Refractions BSD
8+
License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html).

‎plugins/org.locationtech.udig.catalog.shp.tests/META-INF/MANIFEST.MF‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: Shp Test Plug-in
4+
Bundle-SymbolicName: org.locationtech.udig.catalog.shp.tests;singleton:=true
5+
Bundle-Version: 2.3.0.qualifier
6+
Bundle-Vendor: udig.refractions.net
7+
Require-Bundle: org.eclipse.core.runtime,
8+
org.mockito;bundle-version="2.23.0",
9+
net.bytebuddy.byte-buddy;bundle-version="1.9.0",
10+
net.bytebuddy.byte-buddy-agent;bundle-version="1.9.0",
11+
org.junit;bundle-version="4.12.0"
12+
Fragment-Host: org.locationtech.udig.catalog.shp
13+
Bundle-ActivationPolicy: lazy
14+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

‎plugins/org.locationtech.udig.catalog.shp.tests/about.html‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0" encoding="ISO-8859-1" ?>
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3+
<html xmlns="http://www.w3.org/1999/xhtml">
4+
5+
<head>
6+
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
7+
<title>About This Content</title>
8+
<style type="text/css">
9+
body {
10+
size: 8.5in 11.0in;
11+
margin: 1cm 2cm 1cm 2cm;
12+
tab-interval: 1cm;
13+
font-family: Verdana, Arial, Helvetica, sans-serif;
14+
font-size: 9pt;
15+
color: #555;
16+
}
17+
p {
18+
margin:0;
19+
padding:5px 0 5px 0;
20+
}
21+
ul {
22+
margin-top:5px;
23+
margin-bottom:5px;
24+
margin-left:0px;
25+
padding-left:1.5em;
26+
}
27+
h2 {
28+
font-family:Arial, Helvetica, sans-serif;
29+
font-weight:100;
30+
line-height:1.1em;
31+
color:#000000;
32+
margin:0;
33+
padding:10px 0;
34+
font-size:160%;
35+
padding-bottom:9px;
36+
}
37+
}
38+
</style>
39+
40+
</head>
41+
42+
<body lang="EN-US">
43+
44+
<h2>About This Content</h2>
45+
<p>
46+
Sept 25, 2012</p>
47+
48+
<h2>License</h2>
49+
50+
<p>Refractions Research makes available all content in this plug-in ("Content"). Unless otherwise
51+
indicated below, the Content is provided to you under the terms and conditions of the
52+
<a href="http://udig.refractions.net/files/epl-v10.html">Eclipse Public License Version 1.0
53+
("EPL")</a>, and the <a href="http://udig.refractions.net/files/bsd3-v10.html">Refractions BSD
54+
License Version 1.0</a> ("BSD"). For purposes of the EPL and BSD, "Program" will mean the Content.</p>
55+
56+
<p>If you did not receive this Content directly from the Refractions Research, the Content is being
57+
redistributed by another party ("Redistributor") and different terms and conditions may apply to
58+
your use of any object code in the Content. Check the Redistributor's license that was provided with
59+
the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below,
60+
the terms and conditions of the EPL still apply to any source code in the Content and such source
61+
code may be obtained at http://github.com/udig .</p>
62+
63+
</body>
64+
65+
</html>

‎plugins/org.locationtech.udig.catalog.shp.tests/bsd3-v10.html‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE html>
3+
<html>
4+
<header>
5+
<title>Refractions BSD 3 Clause License (BSD)</title>
6+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
7+
<style type="text/css">
8+
body {
9+
size: 8.5in 11.0in;
10+
margin: 1cm 2cm 1cm 2cm;
11+
tab-interval: 1cm;
12+
font-family: Verdana, Arial, Helvetica, sans-serif;
13+
font-size: 9pt;
14+
color: #555;
15+
}
16+
p {
17+
margin:0;
18+
padding:5px 0 5px 0;
19+
}
20+
ul {
21+
margin-top:5px;
22+
margin-bottom:5px;
23+
margin-left:0px;
24+
padding-left:1.5em;
25+
}
26+
h1 {
27+
font-family:Arial, Helvetica, sans-serif;
28+
font-weight:100;
29+
line-height:1.1em;
30+
color:#000000;
31+
margin:0;
32+
padding:10px 0;
33+
font-size:160%;
34+
padding-bottom:9px;
35+
}
36+
</style>
37+
</header>
38+
<body>
39+
<h1>Refractions BSD 3 Clause License (BSD) - v 1.0</h1>
40+
<p>
41+
Copyright (c) 2012, Refractions Research Inc.<br/>
42+
All rights reserved.</p>
43+
44+
<p>
45+
Redistribution and use in source and binary forms, with or without modification, are permitted
46+
provided that the following conditions are met:
47+
</p>
48+
<ul>
49+
<li>Redistributions of source code must retain the above copyright notice, this list of conditions
50+
and the following disclaimer.</li>
51+
<li>Redistributions in binary form must reproduce the above copyright notice, this list of
52+
conditions and the following disclaimer in the documentation and/or other materials provided
53+
with the distribution.</li>
54+
<li>Neither the name of the Refractions Research nor the names of its contributors may be used to
55+
endorse or promote products derived from this software without specific prior written
56+
permission.</li>
57+
</ul>
58+
<p>
59+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
60+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
61+
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
62+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
63+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
64+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
65+
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
66+
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
67+
</p>
68+
</body>

‎plugins/org.locationtech.udig.catalog.shp.tests/build.properties‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
bin.includes = META-INF/,\
2+
.,\
3+
LICENSE.txt,\
4+
epl-v10.html,\
5+
bsd3-v10.html,\
6+
about.html
7+
source.. = src/
8+
output.. = bin/

0 commit comments

Comments
 (0)