Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8530] trunk/framework
|
From: <de...@us...> - 2013-10-23 12:53:21
|
Revision: 8530
http://sourceforge.net/p/fudaa/svn/8530
Author: deniger
Date: 2013-10-23 12:53:17 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
corrections mineurs export tableau csv
Modified Paths:
--------------
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
Added Paths:
-----------
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/ExportTableCommentSupplier.java
Removed Paths:
-------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/ExportTableCommentSupplier.java
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java 2013-10-22 08:58:48 UTC (rev 8529)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java 2013-10-23 12:53:17 UTC (rev 8530)
@@ -7,6 +7,7 @@
import javax.swing.JTable;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.table.CtuluTableModelInterface;
/**
* @author deniger
@@ -14,28 +15,32 @@
*/
@SuppressWarnings("serial")
public class CtuluTableExportAction extends AbstractAction {
-
+
private final CtuluUI ui;
private final JTable table;
- private char separator='\t';
+ private char separator = '\t';
/**
* @param ui
* @param table
*/
public CtuluTableExportAction(CtuluUI ui, JTable table) {
- super(CtuluLib.getS("Exporter le tableau"),BuResource.BU.getMenuIcon("exporter"));
- putValue(Action.ACTION_COMMAND_KEY,"EXPORT_CSV_EXCEL");
- putValue(Action.SHORT_DESCRIPTION,CtuluLib.getS("Exporter le tableau au format csv ou excel"));
+ super(CtuluLib.getS("Exporter le tableau"), BuResource.BU.getMenuIcon("exporter"));
+ putValue(Action.ACTION_COMMAND_KEY, "EXPORT_CSV_EXCEL");
+ putValue(Action.SHORT_DESCRIPTION, CtuluLib.getS("Exporter le tableau au format csv ou excel"));
this.ui = ui;
this.table = table;
-
+
}
@Override
public void actionPerformed(ActionEvent e) {
- CtuluTableExportPanel.doExport(separator,table, ui,CtuluLibSwing.getActiveWindow());
-
+ table.putClientProperty(CtuluTableModelInterface.EXPORT_COMMENT_PROPERTY, null);
+ if (exportTableCommentSupplier != null) {
+ table.putClientProperty(CtuluTableModelInterface.EXPORT_COMMENT_PROPERTY, exportTableCommentSupplier.getComments());
+ }
+ CtuluTableExportPanel.doExport(separator, table, ui, CtuluLibSwing.getActiveWindow());
+
}
/**
@@ -51,5 +56,9 @@
public void setSeparator(char separator) {
this.separator = separator;
}
+ ExportTableCommentSupplier exportTableCommentSupplier;
+ public void setExportTableCommentSupplier(ExportTableCommentSupplier exportTableCommentSupplier) {
+ this.exportTableCommentSupplier = exportTableCommentSupplier;
+ }
}
Copied: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/ExportTableCommentSupplier.java (from rev 8421, trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/ExportTableCommentSupplier.java)
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/ExportTableCommentSupplier.java (rev 0)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/ExportTableCommentSupplier.java 2013-10-23 12:53:17 UTC (rev 8530)
@@ -0,0 +1,15 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ctulu.gui;
+
+import java.util.List;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public interface ExportTableCommentSupplier {
+
+ List<String> getComments();
+}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java 2013-10-22 08:58:48 UTC (rev 8529)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java 2013-10-23 12:53:17 UTC (rev 8530)
@@ -17,7 +17,7 @@
* @author deniger
*/
public class PopupMenuReceiver implements CtuluPopupListener.PopupReceiver {
-
+
private JMenuItem copyItem;
private JMenuItem copyAllItem;
private JMenuItem cutItem;
@@ -26,7 +26,7 @@
private JMenuItem pasteItem;
protected CtuluPopupMenu popupMenu;
private boolean isBuild;
-
+
@SuppressWarnings("serial")
public static Action createCopyAllAction(final JTable table) {
Action res = new AbstractAction(CtuluResource.CTULU.getString("Copier tout"), CtuluResource.CTULU
@@ -34,15 +34,15 @@
@Override
public void actionPerformed(ActionEvent e) {
new CopyAllTableToClipboardRunnable(table).run();
-
+
}
};
res.putValue(Action.SHORT_DESCRIPTION, CtuluLib.getS("Tout copier dans le presse-papier"));
res.putValue(Action.ACTION_COMMAND_KEY, "copyAll");
return res;
-
+
}
-
+
public final void build() {
if (isBuild) {
return;
@@ -57,25 +57,26 @@
}
addItems();
}
-
+
private boolean isTable() {
return component instanceof JTable;
}
-
+ protected CtuluTableExportAction ctuluTableExportAction;
+
protected void addExportItems() {
if (isTable()) {
popupMenu.addSeparator();
- final CtuluTableExportAction ctuluTableExportAction = new CtuluTableExportAction(ui, (JTable) component);
+ ctuluTableExportAction = new CtuluTableExportAction(ui, (JTable) component);
ctuluTableExportAction.setSeparator(';');
popupMenu.add(ctuluTableExportAction);
}
}
-
+
protected void addItems() {
addCopyPasteItems();
addExportItems();
}
-
+
private void addCopyPasteItems() {
popupMenu.add(cutItem);
popupMenu.add(copyItem);
@@ -84,31 +85,31 @@
}
popupMenu.add(pasteItem);
}
-
+
public void install(JComponent component, CtuluUI ui) {
install(component, component, ui);
}
-
+
public void install(JComponent component, JComponent source, CtuluUI ui) {
this.ui = ui;
this.component = source;
assert this.component != null;
new CtuluPopupListener(this, component);
}
-
+
public static void installDefault(JComponent jc, CtuluUI ui) {
new PopupMenuReceiver().install(jc, ui);
-
+
}
-
+
@Override
public void popup(MouseEvent evt) {
build();
updateItemStateBeforeShow();
popupMenu.show(evt.getComponent(), evt.getX(), evt.getY());
-
+
}
-
+
protected void updateItemStateBeforeShow() {
((ActionTransferSource) copyItem.getAction()).updateState();
((ActionTransferSource) cutItem.getAction()).updateState();
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java 2013-10-22 08:58:48 UTC (rev 8529)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java 2013-10-23 12:53:17 UTC (rev 8530)
@@ -51,7 +51,7 @@
import org.fudaa.ctulu.image.CtuluImageProducer;
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.commun.EbliPreferences;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.ebli.palette.BPaletteInfo;
import org.fudaa.ebli.repere.RepereMouseKeyController;
import org.fudaa.ebli.repere.RepereMouseKeyTarget;
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2013-10-22 08:58:48 UTC (rev 8529)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java 2013-10-23 12:53:17 UTC (rev 8530)
@@ -7,6 +7,7 @@
*/
package org.fudaa.ebli.commun;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import java.awt.Component;
import java.awt.event.ActionListener;
import java.awt.event.ItemListener;
Deleted: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/ExportTableCommentSupplier.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/ExportTableCommentSupplier.java 2013-10-22 08:58:48 UTC (rev 8529)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/ExportTableCommentSupplier.java 2013-10-23 12:53:17 UTC (rev 8530)
@@ -1,15 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.ebli.commun;
-
-import java.util.List;
-
-/**
- *
- * @author Frederic Deniger
- */
-public interface ExportTableCommentSupplier {
-
- List<String> getComments();
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
