You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/11/12 20:52:21 UTC
[incubator-netbeans] branch master updated (2dc9605 -> df4f269)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from 2dc9605 [NETBEANS-96] New PAC Script evaluation environment
new bbef687 #270913: Prevent PropertiesEditor from being set to a non Propeties value (apart from NULL)
new 07a1977 #270672: Allow usage of JAXB on JDK9
new 9fd8225 #271446: Add more information to RuntimeExceptions DatabaseMetaData#getProcedureColumns
new df4f269 Import changeset from mercurial repository after creation of donation branch
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
db.metadata.model/nbproject/project.properties | 3 +-
.../db/metadata/model/jdbc/JDBCProcedure.java | 69 ++++++++++++----------
.../netbeans/modules/db/util/PropertiesEditor.java | 16 ++++-
ide/launcher/netbeans.conf | 2 +-
4 files changed, 57 insertions(+), 33 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].
[incubator-netbeans] 04/04: Import changeset from mercurial
repository after creation of donation branch
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit df4f269cade58b17abc428ef23f96c7e300cbfd8
Merge: 2dc9605 9fd8225
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Sun Nov 12 21:51:52 2017 +0100
Import changeset from mercurial repository after creation of donation branch
db.metadata.model/nbproject/project.properties | 3 +-
.../db/metadata/model/jdbc/JDBCProcedure.java | 69 ++++++++++++----------
.../netbeans/modules/db/util/PropertiesEditor.java | 16 ++++-
ide/launcher/netbeans.conf | 2 +-
4 files changed, 57 insertions(+), 33 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.
[incubator-netbeans] 01/04: #270913: Prevent PropertiesEditor from
being set to a non Propeties value (apart from NULL)
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit bbef6872aec72e878a3238191dc83eff53a67c64
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Sun Nov 12 21:29:17 2017 +0100
#270913: Prevent PropertiesEditor from being set to a non Propeties value (apart from NULL)
---
.../org/netbeans/modules/db/util/PropertiesEditor.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/db/src/org/netbeans/modules/db/util/PropertiesEditor.java b/db/src/org/netbeans/modules/db/util/PropertiesEditor.java
index d7be90f..a75c3be 100644
--- a/db/src/org/netbeans/modules/db/util/PropertiesEditor.java
+++ b/db/src/org/netbeans/modules/db/util/PropertiesEditor.java
@@ -23,6 +23,8 @@ import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyEditorSupport;
import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.openide.explorer.propertysheet.ExPropertyEditor;
import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.nodes.Node;
@@ -35,12 +37,14 @@ import org.openide.util.NbBundle;
*/
public class PropertiesEditor extends PropertyEditorSupport implements ExPropertyEditor {
+ private static final Logger LOG = Logger.getLogger(PropertiesEditor.class.getName());
+
private boolean canWrite = true;
@Override
public String getAsText() {
Properties value = (Properties) getValue();
- if (value == null || value.size() == 0) {
+ if (value == null || value.isEmpty()) {
return NbBundle.getMessage(PropertiesEditor.class,
"NoPropertiesSet"); //NOI18N
} else {
@@ -48,6 +52,16 @@ public class PropertiesEditor extends PropertyEditorSupport implements ExPropert
}
}
+ @Override
+ public void setValue(Object value) {
+ if(value == null || value instanceof Properties) {
+ super.setValue(value);
+ } else {
+ super.setValue(null);
+ LOG.log(Level.INFO, "Illegal value supplied to PropertiesEditor#setValue: {0}", value.getClass().getName());
+ }
+ }
+
/**
* Can't be called and throws IllegalArgumentException
*/
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.
[incubator-netbeans] 03/04: #271446: Add more information to
RuntimeExceptions DatabaseMetaData#getProcedureColumns
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 9fd82251f6453271460b6b868a358dd1964da933
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Sun Nov 12 21:40:36 2017 +0100
#271446: Add more information to RuntimeExceptions DatabaseMetaData#getProcedureColumns
---
db.metadata.model/nbproject/project.properties | 3 +-
.../db/metadata/model/jdbc/JDBCProcedure.java | 69 ++++++++++++----------
2 files changed, 41 insertions(+), 31 deletions(-)
diff --git a/db.metadata.model/nbproject/project.properties b/db.metadata.model/nbproject/project.properties
index 9093583..41f8d78 100644
--- a/db.metadata.model/nbproject/project.properties
+++ b/db.metadata.model/nbproject/project.properties
@@ -14,7 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
test.unit.cp.extra=\
diff --git a/db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCProcedure.java b/db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCProcedure.java
index 5d7c8da..8ae5a79 100644
--- a/db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCProcedure.java
+++ b/db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCProcedure.java
@@ -117,42 +117,49 @@ public class JDBCProcedure extends ProcedureImplementation {
}
protected void createProcedureInfo() {
- LOGGER.log(Level.FINE, "Initializing procedure info in " + this);
+ LOGGER.log(Level.FINE, "Initializing procedure info in {0}", this);
- Map<String, Column> newColumns = new LinkedHashMap<String, Column>();
- Map<String, Parameter> newParams = new LinkedHashMap<String, Parameter>();
+ Map<String, Column> newColumns = new LinkedHashMap<>();
+ Map<String, Parameter> newParams = new LinkedHashMap<>();
int resultCount = 0;
int paramCount = 0;
-
- try {
- ResultSet rs = jdbcSchema.getJDBCCatalog().getJDBCMetadata().getDmd().getProcedureColumns(jdbcSchema.getJDBCCatalog().getName(), jdbcSchema.getName(), name, "%"); // NOI18N
- try {
- while (rs.next()) {
- short columnType = rs.getShort("COLUMN_TYPE");
- switch (columnType) {
- case DatabaseMetaData.procedureColumnResult:
- addColumn(++resultCount, rs, newColumns);
- break;
- case DatabaseMetaData.procedureColumnIn:
- case DatabaseMetaData.procedureColumnInOut:
- case DatabaseMetaData.procedureColumnOut:
- case DatabaseMetaData.procedureColumnUnknown:
- addParameter(++paramCount, rs, newParams);
- break;
- case DatabaseMetaData.procedureColumnReturn:
- setReturnValue(rs);
- break;
- default:
- LOGGER.log(Level.INFO, "Encountered unexpected column type " + columnType + " when retrieving metadadta for procedure " + name);
- }
- }
- } finally {
- if (rs != null) {
- rs.close();
+
+ DatabaseMetaData dmd = jdbcSchema.getJDBCCatalog().getJDBCMetadata().getDmd();
+ String catalogName = jdbcSchema.getJDBCCatalog().getName();
+ String schemaName = jdbcSchema.getName();
+
+ try (ResultSet rs = dmd.getProcedureColumns(catalogName, schemaName, name, "%");) { // NOI18N
+ while (rs.next()) {
+ short columnType = rs.getShort("COLUMN_TYPE");
+ switch (columnType) {
+ case DatabaseMetaData.procedureColumnResult:
+ resultCount++;
+ addColumn(resultCount, rs, newColumns);
+ break;
+ case DatabaseMetaData.procedureColumnIn:
+ case DatabaseMetaData.procedureColumnInOut:
+ case DatabaseMetaData.procedureColumnOut:
+ case DatabaseMetaData.procedureColumnUnknown:
+ paramCount++;
+ addParameter(paramCount, rs, newParams);
+ break;
+ case DatabaseMetaData.procedureColumnReturn:
+ setReturnValue(rs);
+ break;
+ default:
+ LOGGER.log(Level.INFO, "Encountered unexpected column type {0} when retrieving metadadta for procedure {1}", new Object[]{columnType, name});
}
}
+ } catch (RuntimeException e) {
+ throw new RuntimeException(String.format(
+ "Failed to retrieve procedure info for catalog: '%s', schema: '%s', procedure: '%s'",
+ catalogName, schemaName, name
+ ), e);
} catch (SQLException e) {
- throw new MetadataException(e);
+ throw new MetadataException(String.format(
+ "Failed to retrieve procedure info for catalog: '%s', schema: '%s', procedure: '%s'",
+ catalogName, schemaName, name
+ ), e);
}
columns = Collections.unmodifiableMap(newColumns);
parameters = Collections.unmodifiableMap(newParams);
@@ -175,6 +182,7 @@ public class JDBCProcedure extends ProcedureImplementation {
LOGGER.log(Level.FINE, "Created return value {0}", returnValue);
}
+ @SuppressWarnings("ReturnOfCollectionOrArrayField")
private Map<String, Column> initColumns() {
if (columns != null) {
return columns;
@@ -183,6 +191,7 @@ public class JDBCProcedure extends ProcedureImplementation {
return columns;
}
+ @SuppressWarnings("ReturnOfCollectionOrArrayField")
private Map<String, Parameter> initParameters() {
if (parameters != null) {
return parameters;
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.
[incubator-netbeans] 02/04: #270672: Allow usage of JAXB on JDK9
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 07a1977eddabd8293fcfe019d3dddf1b8e20d22e
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Sun Nov 12 21:33:15 2017 +0100
#270672: Allow usage of JAXB on JDK9
---
ide/launcher/netbeans.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ide/launcher/netbeans.conf b/ide/launcher/netbeans.conf
index dbf8640..6628c38 100644
--- a/ide/launcher/netbeans.conf
+++ b/ide/launcher/netbeans.conf
@@ -60,7 +60,7 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev"
# Concurrent Mark & Sweep garbage collector.
# (see http://wiki.netbeans.org/FaqGCPauses)
#
-netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-Dnetbeans.logger.console=true -J-ea -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true -J-Dplugin.manager.check.updates=false -J-Dnetbeans.extbrowser.manual_chrome_plugin_install=yes -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL- [...]
+netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-Dnetbeans.logger.console=true -J-ea -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true -J-Dplugin.manager.check.updates=false -J-Dnetbeans.extbrowser.manual_chrome_plugin_install=yes -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL- [...]
# Default location of JDK:
# (set by installer or commented out if launcher should decide)
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.