diff --git a/flowcomposer/lib/flowcomposer.jar b/flowcomposer/lib/flowcomposer.jar
index 097fbf90793eefe484fef67a69fdfe1da209c5f1..82734215a294239eb86a6feac6f54a826c3ea5f3 100644
Binary files a/flowcomposer/lib/flowcomposer.jar and b/flowcomposer/lib/flowcomposer.jar differ
diff --git a/flowcomposer/src/fr/fluxmedia/flowcomposer/FCMarqueeHandler.java b/flowcomposer/src/fr/fluxmedia/flowcomposer/FCMarqueeHandler.java
index f2c35a1f5c970ca0b74d9ab4c35ecaaa14609832..98171262c696623e44274413ce8084644d807cfb 100644
--- a/flowcomposer/src/fr/fluxmedia/flowcomposer/FCMarqueeHandler.java
+++ b/flowcomposer/src/fr/fluxmedia/flowcomposer/FCMarqueeHandler.java
@@ -1,5 +1,5 @@
/**
- * $Id: FCMarqueeHandler.java,v 1.45 2002-07-03 16:35:22 gchomat Exp $
+ * $Id: FCMarqueeHandler.java,v 1.46 2002-07-04 09:14:26 frederic Exp $
*
* Transmorpher
@@ -220,21 +220,22 @@ public class FCMarqueeHandler extends BasicMarqueeHandler {
}
public void mouseReleased(MouseEvent event) {
-
+ ProcessGraph currentProcess = flowcomposer.getCurrentProcess();
+ if (event.isPopupTrigger()){
+ if (!event.isConsumed() && marquee.isSelected()) {
+ flowcomposer.showPopup(event,currentProcess.snap(event.getPoint()));
+ return;
+ }
+ }
Call call;
- ProcessGraph currentProcess = flowcomposer.getCurrentProcess();
+
Process currentTransformation = (Process)currentProcess.getUserObject();
current = currentProcess.snap(event.getPoint());
String tmpName,name;
- if (event.isPopupTrigger()){
- if (!event.isConsumed() && marquee.isSelected()) {
- flowcomposer.showPopup(event,flowcomposer.getCurrentProcess().snap(event.getPoint()));
- return;
- }
- }
-
+
+
if(currentProcess != null){
//endCell= currentProcess.getFirstCellForLocation(event.getX(), event.getY());
diff --git a/flowcomposer/src/fr/fluxmedia/flowcomposer/FlowComposer.java b/flowcomposer/src/fr/fluxmedia/flowcomposer/FlowComposer.java
index 79d4c144136780926a8152d91e5f7cad2f82c8f7..bc3be35115a97f221b66a65bcc488a0c60bce8f1 100644
--- a/flowcomposer/src/fr/fluxmedia/flowcomposer/FlowComposer.java
+++ b/flowcomposer/src/fr/fluxmedia/flowcomposer/FlowComposer.java
@@ -1,6 +1,6 @@
/**
*
- *$Id: FlowComposer.java,v 1.64 2002-07-03 16:31:07 frederic Exp $
+ *$Id: FlowComposer.java,v 1.65 2002-07-04 09:14:26 frederic Exp $
*
* Transmorpher
*
@@ -255,7 +255,7 @@ public class FlowComposer extends JPanel implements GraphModelListener,
public FlowComposer(File file, GraphModel model) {
super(true);
- setFile(file);
+ setFile(file);
try {
UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
@@ -351,18 +351,21 @@ public class FlowComposer extends JPanel implements GraphModelListener,
panel.add(createToolBar("toolbar1"),BorderLayout.NORTH);
center.add(createToolBar("toolbar2"),BorderLayout.NORTH);
Border etched = BorderFactory.createRaisedBevelBorder();
- center.setBorder(etched);
+ //center.setBorder(etched);
//Add a JTabbedPane for represnting the process notion.
//tabProcess= new JTabbedPane();
- tabProcess.getModel().addChangeListener(
+
+ tabProcess.getModel().addChangeListener(
new ChangeListener() {
public void stateChanged(ChangeEvent e) {
SingleSelectionModel model = (SingleSelectionModel) e.getSource();
if(model.getSelectedIndex() != -1) {
- setCurrentProcess(processFactory.getProcess(tabProcess.getTitleAt(model.getSelectedIndex())));
+ Font font = new Font("Arial",Font.PLAIN,13);
+ tabProcess.setFont(font);
+ setCurrentProcess(processFactory.getProcess(tabProcess.getTitleAt(model.getSelectedIndex())));
if(currentProcess== null)
{
System.out.println("currentProcess is null");
@@ -382,8 +385,9 @@ public class FlowComposer extends JPanel implements GraphModelListener,
// Add the Graph as Center Component
center.add(tabProcess, BorderLayout.CENTER);
+ //center.setBackground(Color.lightGray);
panel.add(center,BorderLayout.CENTER);
- this.add(createMenubar(),BorderLayout.NORTH);
+ this.add(createMenubar(),BorderLayout.NORTH);
this.add(panel,BorderLayout.CENTER);
this.add(status,BorderLayout.SOUTH);
addComponentListener(this);
@@ -626,9 +630,11 @@ public class FlowComposer extends JPanel implements GraphModelListener,
else { flow = new FlowLayout(FlowLayout.LEFT,0,0);}
messageScale.setText((String)zoomMessage[2]);
pane.setLayout(flow);
+ pane.setBackground(Color.GRAY);
pane.add(currentProcess);
sp = new JScrollPane(pane,JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
sp = (JScrollPane)(tabProcess.add(currentProcess.getName(),sp));
+ //tabProcess.setBackgroundAt(0,Color.);
tabProcess.setSelectedComponent(sp);
//componentResized(null);
currentProcess.setPreferredSize(new Dimension(PREFERRED_WIDTH,PREFERRED_HEIGHT));
@@ -640,10 +646,12 @@ public class FlowComposer extends JPanel implements GraphModelListener,
JButton but1 = new JButton(">");
JButton but2 = new JButton("<");
JPanel panel = new JPanel();
-
-
+ panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
+ panel.add(but2);
+ panel.add(Box.createHorizontalGlue());
+ panel.add(but1);
+ sp.setColumnHeaderView(panel);
sp.setCorner(JScrollPane.LOWER_RIGHT_CORNER,buttonView);
-
ActionListener buttonListener = new ActionListener() {
public void actionPerformed(ActionEvent e) {
JDialog overviewDlg = new JDialog(getFrame(),"GeneralView", false);
@@ -675,11 +683,12 @@ public class FlowComposer extends JPanel implements GraphModelListener,
protected JMenuBar createMenubar() {
JMenuItem mi;
menubar = new JMenuBar();
-
String[] menuKeys = tokenize(getResourceString("menubar"));
for (int i = 0; i < menuKeys.length; i++) {
String[] itemKeys = tokenize(getResourceString(menuKeys[i]));
JMenu m = createMenu(menuKeys[i], itemKeys);
+ Font font = new Font("Arial",Font.PLAIN,13);
+ m.setFont(font);
if (m != null) {
menubar.add(m);
}
@@ -698,6 +707,8 @@ public class FlowComposer extends JPanel implements GraphModelListener,
menu.addSeparator();
} else {
JMenuItem mi = createMenuItem(itemKeys[i]);
+ Font font = new Font("Arial",Font.PLAIN,13);
+ mi.setFont(font);
menu.add(mi);
}
}