Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/db relationshin dialog entities #335

Merged
merged 2 commits into from Oct 23, 2018
Merged

Feature/db relationshin dialog entities #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97e7baa
CAY-2490 Added db entities from other datamaps. Added renderer.
const1993 Oct 17, 2018
c634237
CAY-2490 Fixed DbRelationshipTargetView appearance on OSX.
const1993 Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Expand Up @@ -40,6 +40,7 @@ CAY-2472 Clear cached replacement query on mutation in all indirect queries
CAY-2476 Modeller: Fixed wrong behaviour of code generation dialog
CAY-2480 cayenne:cdbgen and cayenne:cgen have identical text in cayenne-maven-plugin
CAY-2484 maven plugins missing in 4.1.M2 release
CAY-2490 Added dbEntities from other datamaps in dbRelationship dialog.

----------------------------------
Release: 4.1.M2
Expand Down
18 changes: 13 additions & 5 deletions ...deler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTarget.java
View file
Open in desktop
Expand Up @@ -22,12 +22,15 @@
import java.util.ArrayList;
import java.util.List;

import javax.swing.DefaultComboBoxModel;
import javax.swing.JOptionPane;
import javax.swing.WindowConstants;

import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.CayenneController;
import org.apache.cayenne.modeler.util.CellRenderers;
import org.apache.cayenne.modeler.util.Comparators;

public class DbRelationshipTarget extends CayenneController {
Expand All @@ -38,7 +41,7 @@ public class DbRelationshipTarget extends CayenneController {
protected List<DbEntity> relTargets;

protected DbEntity source;
protected ProjectController mediator;
protected CayenneController mediator;
protected boolean source1Selected;
protected DbRelationshipTargetView view;
protected boolean toMany;
Expand All @@ -54,12 +57,17 @@ public DbRelationshipTarget(ProjectController mediator, DbEntity source1, DbEnti
this.mediator = mediator;
this.source1 = source1;
this.source2 = source2;
this.relTargets = new ArrayList<>(source1.getDataMap().getDbEntities());

EntityResolver resolver = mediator.getEntityResolver();
this.relTargets = new ArrayList<>(resolver.getDbEntities());
relTargets.sort(Comparators.getNamedObjectComparator());

DbEntity[] dbEntities = relTargets.toArray(new DbEntity[0]);

DefaultComboBoxModel<DbEntity> dbModel = new DefaultComboBoxModel<>(dbEntities);
view.targetCombo.setRenderer(CellRenderers.entityListRendererWithIcons(mediator.getCurrentDataMap()));
view.targetCombo.removeAllItems();
for (DbEntity d : relTargets) {
view.targetCombo.addItem(d.getName());
}
view.targetCombo.setModel(dbModel);
}

private void initController() {
Expand Down
6 changes: 4 additions & 2 deletions ...r/src/main/java/org/apache/cayenne/modeler/dialog/objentity/DbRelationshipTargetView.java
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.util.DefaultWidgetFactory;
import org.apache.cayenne.modeler.util.PanelFactory;
import org.apache.cayenne.modeler.util.WidgetFactory;
Expand All @@ -42,10 +43,11 @@ public class DbRelationshipTargetView extends JDialog {
protected JButton cancelButton;
protected JRadioButton source1Button;
protected JRadioButton source2Button;
protected JComboBox<String> targetCombo;
protected JComboBox<DbEntity> targetCombo;

public DbRelationshipTargetView(DbEntity source1, DbEntity source2) {

super(Application.getFrame());

widgetFactory = new DefaultWidgetFactory();

// create widgets
Expand Down
2 changes: 2 additions & 0 deletions ...er/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoView.java
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.DefaultWidgetFactory;
import org.apache.cayenne.modeler.util.MultiColumnBrowser;
Expand Down Expand Up @@ -65,6 +66,7 @@ public class ObjRelationshipInfoView extends JDialog{
ProjectController mediator;

public ObjRelationshipInfoView(final ProjectController mediator) {
super(Application.getFrame());

this.mediator = mediator;

Expand Down