Repository: incubator-netbeans Updated Branches: refs/heads/master a6ac29078 -> ac97299a0
[NETBEANS-54] Module Review db.dataview - no external libraries - fix Rat files: - add missing ALv2 headers for .sql files - move dbdata.txt to dbdata.properties and add header - fix missing header adjustments (all file copyright Sun/Oracle) Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/ac97299a Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/ac97299a Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/ac97299a Branch: refs/heads/master Commit: ac97299a0f03e3208ad4bf504a21067dc83a1bc7 Parents: a6ac290 Author: Matthias Bläsing <[email protected]> Authored: Mon Sep 25 17:56:19 2017 +0200 Committer: Matthias Bläsing <[email protected]> Committed: Wed Oct 4 20:18:20 2017 +0200 ---------------------------------------------------------------------- .../db/dataview/output/Bundle.properties | 44 ++++++--------- .../db/dataview/output/DataViewPageContext.java | 57 ++++++-------------- .../modules/db/dataview/output/DataViewUI.java | 55 ++++++------------- .../db/dataview/table/ResultSetTableModel.java | 56 ++++++------------- db.dataview/test/unit/data/etc/dbcreate.sql | 16 ++++++ .../test/unit/data/etc/dbdata.properties | 28 ++++++++++ db.dataview/test/unit/data/etc/dbdata.sql | 16 ++++++ db.dataview/test/unit/data/etc/dbdata.txt | 11 ---- db.dataview/test/unit/data/etc/dbdel.sql | 16 ++++++ db.dataview/test/unit/data/etc/dbinsert.sql | 16 ++++++ db.dataview/test/unit/data/etc/dbselect.sql | 16 ++++++ db.dataview/test/unit/data/etc/dbupdate.sql | 16 ++++++ .../db/dataview/util/TestCaseContext.java | 2 +- .../db/dataview/util/TestCaseDataFactory.java | 4 +- 14 files changed, 189 insertions(+), 164 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/src/org/netbeans/modules/db/dataview/output/Bundle.properties ---------------------------------------------------------------------- diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/Bundle.properties b/db.dataview/src/org/netbeans/modules/db/dataview/output/Bundle.properties index 47c1516..f944289 100644 --- a/db.dataview/src/org/netbeans/modules/db/dataview/output/Bundle.properties +++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/Bundle.properties @@ -1,34 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun -# Microsystems, Inc. All Rights Reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # Sample ResourceBundle properties file MSG_LoadData=Loading Data http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewPageContext.java ---------------------------------------------------------------------- diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewPageContext.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewPageContext.java index 1f224cb..e18c96a 100644 --- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewPageContext.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewPageContext.java @@ -1,53 +1,28 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR parent HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - * - * The contents of parent file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use parent file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include parent License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied parent code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun - * Microsystems, Inc. All Rights Reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If you wish your version of parent file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include parent software in parent distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of parent file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.netbeans.modules.db.dataview.output; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import org.netbeans.modules.db.dataview.meta.DBColumn; import org.openide.util.Mutex; -import org.openide.util.NbBundle; /** * Holds data view page pointers and the current page data set http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java ---------------------------------------------------------------------- diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java index efacaf8..cb48c75 100644 --- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java @@ -1,45 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR parent HEADER. - * - * Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - * - * The contents of parent file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use parent file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include parent License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied parent code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun - * Microsystems, Inc. All Rights Reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If you wish your version of parent file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include parent software in parent distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of parent file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.db.dataview.output; http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java ---------------------------------------------------------------------- diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java index 345c310..5bb445e 100644 --- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableModel.java @@ -1,46 +1,22 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR parent HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - * - * The contents of parent file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use parent file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include parent License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied parent code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun - * Microsystems, Inc. All Rights Reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If you wish your version of parent file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include parent software in parent distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of parent file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.netbeans.modules.db.dataview.table; import java.beans.PropertyChangeListener; http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/test/unit/data/etc/dbcreate.sql ---------------------------------------------------------------------- diff --git a/db.dataview/test/unit/data/etc/dbcreate.sql b/db.dataview/test/unit/data/etc/dbcreate.sql index 5e2d740..d1521aa 100644 --- a/db.dataview/test/unit/data/etc/dbcreate.sql +++ b/db.dataview/test/unit/data/etc/dbcreate.sql @@ -1 +1,17 @@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. create table if not exists simpletable (tinyintc INT,smallintc INT,varcharc VARCHAR(20),intc INT,bigintc BIGINT,datec DATE,charc CHAR,datetime TIMESTAMP,floatc FLOAT,doublec DOUBLE,doubleprecisionc DOUBLE,CONSTRAINT pk_tinyintc PRIMARY KEY (tinyintc, smallintc)); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/test/unit/data/etc/dbdata.properties ---------------------------------------------------------------------- diff --git a/db.dataview/test/unit/data/etc/dbdata.properties b/db.dataview/test/unit/data/etc/dbdata.properties new file mode 100644 index 0000000..5b834e2 --- /dev/null +++ b/db.dataview/test/unit/data/etc/dbdata.properties @@ -0,0 +1,28 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +tinyintc=-80 +smallintc=-32766 +varcharc=ala +intc=123456 +bigintc=123 +datec=Oct 10, 2005 +charc=c +datetime=Apr 1, 2005 10:12:32 PM +floatc=2.65 +doublec=-217.5 +doubleprecisionc=4.32 http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/test/unit/data/etc/dbdata.sql ---------------------------------------------------------------------- diff --git a/db.dataview/test/unit/data/etc/dbdata.sql b/db.dataview/test/unit/data/etc/dbdata.sql index 6c62342..23bcd86 100644 --- a/db.dataview/test/unit/data/etc/dbdata.sql +++ b/db.dataview/test/unit/data/etc/dbdata.sql @@ -1 +1,17 @@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. INSERT INTO simpletable (tinyintc,smallintc,varcharc,intc,bigintc,datec,charc,datetime,floatc,doublec,doubleprecisionc) VALUES (-80,-32766,'ala',123456,123,'2005-10-10','c','2005-04-01 22:12:32',2.65,-217.5,4.32); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/test/unit/data/etc/dbdata.txt ---------------------------------------------------------------------- diff --git a/db.dataview/test/unit/data/etc/dbdata.txt b/db.dataview/test/unit/data/etc/dbdata.txt deleted file mode 100644 index 83d4501..0000000 --- a/db.dataview/test/unit/data/etc/dbdata.txt +++ /dev/null @@ -1,11 +0,0 @@ -tinyintc=-80 -smallintc=-32766 -varcharc=ala -intc=123456 -bigintc=123 -datec=Oct 10, 2005 -charc=c -datetime=Apr 1, 2005 10:12:32 PM -floatc=2.65 -doublec=-217.5 -doubleprecisionc=4.32 http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/test/unit/data/etc/dbdel.sql ---------------------------------------------------------------------- diff --git a/db.dataview/test/unit/data/etc/dbdel.sql b/db.dataview/test/unit/data/etc/dbdel.sql index 8b41f2b..328d809 100644 --- a/db.dataview/test/unit/data/etc/dbdel.sql +++ b/db.dataview/test/unit/data/etc/dbdel.sql @@ -1 +1,17 @@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. drop table IF EXISTS CASCADE simpletable; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/test/unit/data/etc/dbinsert.sql ---------------------------------------------------------------------- diff --git a/db.dataview/test/unit/data/etc/dbinsert.sql b/db.dataview/test/unit/data/etc/dbinsert.sql index 6c62342..23bcd86 100644 --- a/db.dataview/test/unit/data/etc/dbinsert.sql +++ b/db.dataview/test/unit/data/etc/dbinsert.sql @@ -1 +1,17 @@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. INSERT INTO simpletable (tinyintc,smallintc,varcharc,intc,bigintc,datec,charc,datetime,floatc,doublec,doubleprecisionc) VALUES (-80,-32766,'ala',123456,123,'2005-10-10','c','2005-04-01 22:12:32',2.65,-217.5,4.32); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/test/unit/data/etc/dbselect.sql ---------------------------------------------------------------------- diff --git a/db.dataview/test/unit/data/etc/dbselect.sql b/db.dataview/test/unit/data/etc/dbselect.sql index e96662e..3cf1065 100644 --- a/db.dataview/test/unit/data/etc/dbselect.sql +++ b/db.dataview/test/unit/data/etc/dbselect.sql @@ -1 +1,17 @@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. select * from simpletable \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/test/unit/data/etc/dbupdate.sql ---------------------------------------------------------------------- diff --git a/db.dataview/test/unit/data/etc/dbupdate.sql b/db.dataview/test/unit/data/etc/dbupdate.sql index 7a378f2..b216037 100644 --- a/db.dataview/test/unit/data/etc/dbupdate.sql +++ b/db.dataview/test/unit/data/etc/dbupdate.sql @@ -1 +1,17 @@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. update simpletable set tinyintc='-40' where tinyintc='-80'; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java ---------------------------------------------------------------------- diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java index ea83720..69765d6 100644 --- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java +++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseContext.java @@ -53,7 +53,7 @@ public class TestCaseContext { setSqlUpdate((File)map.get(TestCaseDataFactory.DB_SQLUPDATE)); setSqlDel((File)map.get(TestCaseDataFactory.DB_SQLDEL)); setSqlSelect((File)map.get(TestCaseDataFactory.DB_SQLSELECT)); - setData((File)map.get(TestCaseDataFactory.DB_TEXT)); + setData((File)map.get(TestCaseDataFactory.DB_DATA)); } http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ac97299a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java ---------------------------------------------------------------------- diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java index a3abb2c..76cc696 100644 --- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java +++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java @@ -39,11 +39,11 @@ public class TestCaseDataFactory { public static String DB_SQLINSERT="dbinsert.sql"; public static String DB_SQLSELECT="dbselect.sql"; public static String DB_SQLUPDATE="dbupdate.sql"; - public static String DB_TEXT= "dbdata.txt"; + public static String DB_DATA= "dbdata.properties"; public static String DB_PROP= "dbprop.properties"; public static String DB_SQLDEL="dbdel.sql"; public static String DB_JARS="jar"; - public static String[] FILES={DB_SQLCREATE,DB_SQLINSERT,DB_SQLUPDATE,DB_PROP,DB_SQLDEL,DB_SQLSELECT,DB_TEXT}; + public static String[] FILES={DB_SQLCREATE,DB_SQLINSERT,DB_SQLUPDATE,DB_PROP,DB_SQLDEL,DB_SQLSELECT,DB_DATA}; private List<TestCaseContext> list=new ArrayList<TestCaseContext>(); private static TestCaseDataFactory factory;
