You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/10/08 10:59:40 UTC
[2/3] cayenne git commit: Update text color of dbType column in
objAttrTable
Update text color of dbType column in objAttrTable
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/005069ce
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/005069ce
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/005069ce
Branch: refs/heads/STABLE-4.0
Commit: 005069cecbcc52664f21c7da2e3cad50c142ff3e
Parents: 4fe062c
Author: Arseni Bulatski <an...@gmail.com>
Authored: Thu Sep 13 17:42:22 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Thu Oct 4 16:18:22 2018 +0300
----------------------------------------------------------------------
.../dialog/db/load/DbLoadResultDialog.java | 107 -------------------
.../validator/DuplicatedAttributesDialog.java | 10 +-
.../modeler/editor/ObjEntityAttributePanel.java | 2 +-
3 files changed, 9 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/005069ce/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java
deleted file mode 100644
index 80d8b61..0000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-
-package org.apache.cayenne.modeler.dialog.db.load;
-
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.table.DefaultTableModel;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-/**
- * @since 4.1
- */
-public class DbLoadResultDialog extends JDialog {
-
- private static final int TABLE_ROW_HIGH = 24;
- private static final int TABLE_ROW_MARGIN = 3;
-
- private DefaultTableModel tableModel;
- private JTable table;
- private JButton okButton;
- private String title;
-
- DbLoadResultDialog(String title) {
- super();
- this.title = title;
- initElements();
- buildElements();
- configureDialog();
- }
-
- private void configureDialog() {
- this.setResizable(false);
- this.setTitle(title);
- this.pack();
- this.setLocationRelativeTo(null);
- this.setModal(false);
- this.setAlwaysOnTop(true);
- }
-
- private void initElements() {
- tableModel = new DefaultTableModel() {
- @Override
- public boolean isCellEditable(int row, int col) {
- return false;
- }
- };
- table = new JTable(tableModel);
- table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- table.setRowHeight(TABLE_ROW_HIGH);
- table.setRowMargin(TABLE_ROW_MARGIN);
- tableModel.addColumn("");
- okButton = new JButton("OK");
- okButton.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- DbLoadResultDialog.this.setVisible(false);
- }
- });
- }
-
- private void buildElements() {
- getRootPane().setDefaultButton(okButton);
-
- FormLayout layout = new FormLayout("fill:200dlu");
- DefaultFormBuilder builder = new DefaultFormBuilder(layout);
- builder.append(new JScrollPane(table, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
- JScrollPane.HORIZONTAL_SCROLLBAR_NEVER));
- JPanel panel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
- panel.add(okButton);
- builder.append(panel);
- this.add(builder.getPanel());
- }
-
- public void addRowToOutput(String output) {
- tableModel.addRow(new Object[]{output});
- }
-
- public int getTableRowCount() {
- return tableModel.getRowCount();
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/005069ce/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DuplicatedAttributesDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DuplicatedAttributesDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DuplicatedAttributesDialog.java
index a7be65f..766a0f5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DuplicatedAttributesDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DuplicatedAttributesDialog.java
@@ -30,9 +30,15 @@ import org.apache.cayenne.modeler.util.CayenneDialog;
import org.apache.cayenne.modeler.util.CayenneTableModel;
import org.apache.cayenne.modeler.util.ProjectUtil;
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
import javax.swing.table.TableColumn;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.LinkedList;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/005069ce/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
index 55e2013..b0a168a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
@@ -86,8 +86,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
+import java.util.List;
/**
* Detail view of the ObjEntity attributes.