From echatellier@users.forge.codelutin.com Thu May 7 09:51:51 2015
From: echatellier@users.forge.codelutin.com
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r4221 - in
trunk/src/main/java/fr/ifremer/isisfish/ui: script util vcs
Date: Thu, 07 May 2015 09:51:51 +0000
Message-ID: <20150507095151.13D425C6823@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5397586141206783641=="
--===============5397586141206783641==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Author: echatellier
Date: 2015-05-07 09:51:50 +0000 (Thu, 07 May 2015)
New Revision: 4221
Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4221
Log:
Remove unused code (UI deprecated code)
Removed:
trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx
trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css
trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx
trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/
trunk/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java
trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java
trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java
trunk/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java
trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx
trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx
trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx
Modified:
trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java
trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx
trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx
trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx
trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx
Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 201=
5-05-07 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 201=
5-05-07 09:51:50 UTC (rev 4221)
@@ -1,86 +0,0 @@
-
-
-
-
-
- |
-
-
-
- |
-
-
- |
-
- |
-
-
-
- |
-
-
- |
-
-
- =
=20
-
-
- |
-
-
-
Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css 2015=
-05-07 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css 2015=
-05-07 09:51:50 UTC (rev 4221)
@@ -1,31 +0,0 @@
-/*
- * #%L
- * IsisFish
- *=20
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2009 - 2010 Ifremer, CodeLutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the=20
- * License, or (at your option) any later version.
- *=20
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *=20
- * You should have received a copy of the GNU General Public=20
- * License along with this program. If not, see
- * .
- * #L%
- */
-#newFilesLabel {
- foreground: "{new java.awt.Color(051,102,225)}";
-}
-
-#conflictFilesLabel {
- foreground: red;
-}
Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 201=
5-05-07 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 201=
5-05-07 09:51:50 UTC (rev 4221)
@@ -1,127 +0,0 @@
-
-
-
- java.io.File
- java.awt.Color
-
-
-
-
-
- =20
-
-
-
-
- =20
-
-
-
-
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
-
-
- |
-
-
-
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2015-=
05-07 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2015-=
05-07 09:51:50 UTC (rev 4221)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2006 - 2012 Ifremer, Code Lutin, C=C3=A9dric Pineau, Benjam=
in Poussin, Chatellier Eric
+ * Copyright (C) 2006 - 2015 Ifremer, Code Lutin, C=C3=A9dric Pineau, Benjam=
in Poussin, Chatellier Eric
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -89,7 +89,6 @@
import fr.ifremer.isisfish.ui.script.model.ScriptTree;
import fr.ifremer.isisfish.ui.script.model.ScriptTreeModel;
import fr.ifremer.isisfish.ui.util.ErrorHelper;
-import fr.ifremer.isisfish.ui.vcs.UpdateDialogUI;
import fr.ifremer.isisfish.util.CompileHelper;
import fr.ifremer.isisfish.util.JavadocHelper;
import fr.ifremer.isisfish.vcs.VCSException;
@@ -701,25 +700,6 @@
return scriptFileFilter;
}
=20
- //public static Object updateScript()
- public void updateScript() {
- try {
- log.debug("updateScript called for ");
- //TODO Use VCS UI dialog
- UpdateDialogUI ui =3D new UpdateDialogUI();
- ui.setVisible(true);
- //TODO Use FileState new mechanism to obtain state
- if (codeStorage !=3D null) {
- codeStorage.update();
- codeStorage.reload();
- }
- } catch (VCSException ex) {
- if (log.isErrorEnabled()) {
- log.error("Error on script update", ex);
- }
- }
- }
-
/**
* Check script content.
*=20
@@ -862,167 +842,6 @@
}
=20
/**
- * Show a improved script dialog with multiple selection support.
- */
- public void importScript() {
-
- if (log.isDebugEnabled()) {
- log.debug("importScript ");
- }
-
- File root =3D IsisFish.config.getDatabaseDirectory();
- try {
- // ask user form a .zip file
- File file =3D FileUtil.getFile(".*.zip$",
- t("isisfish.message.import.scripts.zipped"));
- if (file !=3D null) {
-
- //frame.setInfoText(t("isisfish.message.import.scripts.file"=
, file));
-
- // get two list of relative path (one for new files,
- // one for exisiting files)
- List[] explode =3D scanZip(file, root);
- List newFiles =3D explode[0];
- List conflictFiles =3D explode[1];
-
- // build model for dialog (list of new items), (list of exis=
iting items)
- FileSelectionTableModel modelNewItems =3D null;
- FileSelectionTableModel modelItems =3D null;
-
- // si'il y a des nouveau fichiers
- //if (!newFiles.isEmpty()) {
- modelNewItems =3D new FileSelectionTableModel(newFiles);
- //}
-
- // s'il y a des fichier en conflic
- //if (!conflictFiles.isEmpty()) {
- modelItems =3D new FileSelectionTableModel(conflictFiles);
- //}
-
- // create import dialog
- // TODO do a better code
- ImportDialogUI dialog =3D new ImportDialogUI();
- dialog.setNewFilesTableModel(modelNewItems);
- dialog.setConflictFilesTableModel(modelItems);
- dialog.getConflictFilesTable().setModel(modelItems);
- dialog.getNewFilesTable().setModel(modelNewItems);
- // can't be in ui :(
- dialog.getNewFilesTable().getColumnModel().getColumn(0)
- .setWidth(30);
- dialog.getConflictFilesTable().getColumnModel().getColumn(0)
- .setWidth(30);
- dialog.getArchivePath().setText(file.getAbsolutePath());
- dialog.refresh();
- dialog.pack();
- SwingUtil.center(dialog);
- dialog.setVisible(true);
- setStatusMessage(t("isisfish.message.import.scripts.file.don=
e", file));
- } else {
- setStatusMessage(t("isisfish.message.import.scripts.file.can=
celled"));
- }
- } catch (Exception eee) {
- returnError(t("isisfish.error.script.import", eee.getMessage()),
- eee);
- }
- }
-
- /**
- * Perform import script action called by {@link ImportDialogUI}.
- *=20
- * @param sourceScriptArchive source archive file
- * @param selectedFiles selected non conflict files model
- * @param selectedConflictFiles selected conflict files model
- */
- public void performImportScript(File sourceScriptArchive,
- FileSelectionTableModel selectedFiles,
- FileSelectionTableModel selectedConflictFiles) {
-
- File sourceDirectory =3D IsisFish.config.getDatabaseDirectory();
-
- List filesToImports =3D new ArrayList();
- if (selectedFiles !=3D null) {
- filesToImports.addAll(selectedFiles.getSelectedFiles());
- }
-
- if (selectedConflictFiles !=3D null) {
- // do backup stuff (only backup conflict files)
- backupScripts(selectedConflictFiles.getSelectedFiles(),
- sourceDirectory);
-
- filesToImports.addAll(selectedConflictFiles.getSelectedFiles());
- }
-
- // unflate files to destination (root)
- try {
- if (log.isInfoEnabled()) {
- for (String newFile : filesToImports) {
- log.info("unzip " + newFile);
- }
- }
- ZipUtil.uncompress(sourceScriptArchive, sourceDirectory,
- filesToImports, null, null);
-
- } catch (IOException e1) {
- throw new RuntimeException(e1);
- }
- if (log.isInfoEnabled()) {
- log.info("Unzip " + filesToImports.size() + " entry(ies) from '"
- + sourceScriptArchive + "'");
- }
- }
-
- /**
- * Make a backup a given files to current isis backup directory.
- *=20
- * @param paths
- */
- protected void backupScripts(List paths, File destination) {
-
- File backupDirectory =3D IsisFish.config.getBackupSessionDirectory();
-
- if (log.isDebugEnabled()) {
- log.debug("Backup directory is : " + backupDirectory);
- }
- String suffix =3D "_"
- + IsisFish.config.getBackupSessionDirectory().getName();
- try {
- for (String path : paths) {
-
- //backup(new File(src, path), path, suffix);
-
- File sourceFile =3D new File(destination, path);
-
- if (!sourceFile.exists()) {
- return;
- }
- if (sourceFile.isDirectory()) {
- File dst =3D new File(backupDirectory, path);
- dst.mkdirs();
- } else {
- int extension =3D path.lastIndexOf(".");
- if (extension !=3D -1) {
- path =3D path.substring(0, extension) + suffix + "."
- + path.substring(extension + 1);
- } else {
- path +=3D suffix;
- }
- File dst =3D new File(destination, path);
- if (!dst.getParentFile().exists()) {
- dst.getParentFile().mkdirs();
- }
- if (log.isInfoEnabled()) {
- log.info("Copying " + sourceFile.getName() + " to "
- + dst);
- }
- FileUtils.copyFile(sourceFile, dst);
- }
- }
- } catch (Exception ex) {
- throw new IsisFishRuntimeException("Can't backup scripts", ex);
- }
- }
-
- /**
* Copy a single file to destination directory.
*=20
* @param src file to copy
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2015-05-0=
7 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2015-05-0=
7 09:51:50 UTC (rev 4221)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric
+ Copyright (C) 2009 - 2015 Ifremer, CodeLutin, Chatellier Eric
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -71,11 +71,6 @@
-
-
-
@@ -92,8 +87,6 @@
onActionPerformed=3D"getScriptAction().commitScript()" enabl=
ed=3D'{isSingleFileSelected()}' />
-
Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java 2015-05-07 0=
9:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java 2015-05-07 0=
9:51:50 UTC (rev 4221)
@@ -1,84 +0,0 @@
-/*
- * #%L
- * IsisFish
- *=20
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2009 - 2010 Ifremer, CodeLutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the=20
- * License, or (at your option) any later version.
- *=20
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *=20
- * You should have received a copy of the GNU General Public=20
- * License along with this program. If not, see
- * .
- * #L%
- */
-
-package fr.ifremer.isisfish.ui.util;
-
-import javax.swing.AbstractAction;
-import javax.swing.JButton;
-import java.awt.Dimension;
-
-public interface IDialog {
- /**
- * @return the ok button (jaxx generated)
- */
- JButton getOk();
-
- /**
- * @return the cancel button (jaxx generated)
- */
- JButton getCancel();
-
- /**
- * to doRefresh dialog (use processDataBinding)
- */
- void doRefresh();
-
- /**
- * @return true if ok button is enabled, false
- * otherwise
- */
- boolean isOkEnabled();
-
- /**
- * @return true if dialog has no data, false
- * otherwise
- */
- boolean isEmpty();
-
- int computeWidth();
-
- int computeHeight();
-
- // ------------------ JDialog methods
- void setVisible(boolean b);
-
- void setSize(int width, int height);
-
- void setMaximumSize(Dimension dimension);
-
- void setOkAction(AbstractAction okAction);
-
- void setCancelAction(AbstractAction cancelAction);
-
- void setMaxWidth(int maxWidth);
-
- void setMinHeight(int minHeight);
-
- void setMaxHeight(int maxHeight);
-
- void repaint();
-
- void setTitle(String s);
-}
Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java 2015-05-0=
7 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java 2015-05-0=
7 09:51:50 UTC (rev 4221)
@@ -1,113 +0,0 @@
-/*
- * #%L
- * IsisFish
- *=20
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2009 - 2010 Ifremer, CodeLutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the=20
- * License, or (at your option) any later version.
- *=20
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *=20
- * You should have received a copy of the GNU General Public=20
- * License along with this program. If not, see
- * .
- * #L%
- */
-
-package fr.ifremer.isisfish.ui.util;
-
-import javax.swing.AbstractAction;
-import javax.swing.JDialog;
-import java.awt.event.ActionEvent;
-
-public abstract class IsisAction extends AbstractAction {
- /**
- * flag to say if something has been done in this action (is init in
- * {@link #prepare()} method)
- */
- protected boolean used;
- /**
- * dialog source of the action (of null if none)
- */
- protected JDialog dialog;
-
- private static final long serialVersionUID =3D -968662451138199001L;
-
- protected IsisAction() {
- this(null);
- }
-
- protected IsisAction(JDialog dialog) {
- this.dialog =3D dialog;
- }
-
-
- public void actionPerformed(ActionEvent e) {
-
- try {
- // just prepare action and set used field value
- used =3D prepare();
-
- // perform action if there is something to do
- if (used) {
- perform(e);
- }
- } finally {
- //TODO Fix lock between few dialog
- // after action perfored
- finish();
- }
- }
- /**
- * Prepare data for action, and find out if there is really something to
- * do here.
- *
- * @return true if there is something to do here,
- * false otherwise
- */
- protected abstract boolean prepare();
-
- /**
- * perform safelly action after {@link #prepare()} was invoked
- * This method is only called if used was true
- *
- * @param e event source
- */
- protected abstract void perform(ActionEvent e);
-
- /**
- * called inside {@link #actionPerformed(java.awt.event.ActionEvent)} af=
ter
- * {@link #perform(java.awt.event.ActionEvent)} was invoked (so can't
- * be come here is nothing was to be done in this action.
- */
- protected void finish() {
- if (dialog !=3D null && needDispose()) {
- dialog.dispose();
- }
- }
-
- /**
- * @return true if we have to dispose dialog,
- * false otherwise
- */
- protected boolean needDispose() {
- return used;
- }
-
- /**
- * @return true if something was done in the action perform=
ed,
- * false otherwise
- */
- public boolean isUsed() {
- return used;
- }
-}
Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java=
2015-05-07 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java=
2015-05-07 09:51:50 UTC (rev 4221)
@@ -1,87 +0,0 @@
-/*
- * #%L
- * IsisFish
- *=20
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2009 - 2010 Ifremer, CodeLutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the=20
- * License, or (at your option) any later version.
- *=20
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *=20
- * You should have received a copy of the GNU General Public=20
- * License along with this program. If not, see
- * .
- * #L%
- */
-
-package fr.ifremer.isisfish.ui.util;
-
-import java.awt.event.ActionEvent;
-import java.io.File;
-import java.util.List;
-
-import javax.swing.JDialog;
-
-import fr.ifremer.isisfish.IsisFish;
-import fr.ifremer.isisfish.ui.script.action.BackupAction;
-
-/**
- * This abstract action perform a backup action.
- *=20
- * @author chatellier
- * @version $Revision$
- *=20
- * Last update : $Date$
- * By : $Author$
- *=20
- * @deprecated C'est pas evident de faire des Actions swing avec jaxx
- */
-public abstract class IsisActionWithBackup extends IsisAction {
-
- /** serialVersionUID. */
- private static final long serialVersionUID =3D -5498329861390316586L;
-
- /** Root directory of files to be backupped. */
- protected File root;
-
- /**
- * Constructor.
- *=20
- * @param dialog dialog ???
- * @param root root directory of files to be backupped
- */
- protected IsisActionWithBackup(JDialog dialog, File root) {
- super(dialog);
- this.root =3D root;
- }
-
- /**
- * obtain the list of relative path to {@link #root} directory needed
- * to be backuped in {@code #backupRoot} directory
- *
- * @return the list of relative path to files to backup
- */
- protected abstract List getFilesToBackup();
-
- /**
- * Just perform a {@link BackupAction}.
- *=20
- * Need to be overridden and called by {@code super.perform(e)}
- */
- @Override
- protected void perform(ActionEvent e) {
- // do backup stuff here =20
- BackupAction backupAction =3D new BackupAction(root, IsisFish.config
- .getBackupSessionDirectory(), getFilesToBackup());
- backupAction.actionPerformed(e);
- }
-}
Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java 2015-05-07 =
09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java 2015-05-07 =
09:51:50 UTC (rev 4221)
@@ -1,70 +0,0 @@
-/*
- * #%L
- * IsisFish
- *=20
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2009 - 2010 Ifremer, CodeLutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the=20
- * License, or (at your option) any later version.
- *=20
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *=20
- * You should have received a copy of the GNU General Public=20
- * License along with this program. If not, see
- * .
- * #L%
- */
-package fr.ifremer.isisfish.ui.util;
-
-import jaxx.runtime.JAXXObject;
-
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JTextField;
-import java.util.Map;
-
-/** some util generic algorithm for jaxx objects */
-public class JaxxUtil {
-
- public static void doReset(Map $objectMap) {
-
- if ($objectMap =3D=3D null) return;
-
- for (Map.Entry o : $objectMap.entrySet()) {
- Class aClass =3D o.getValue().getClass();
- Object val =3D o.getValue();
- if (JTextField.class.isAssignableFrom(aClass))
- ((JTextField) val).setText("");
- else if (JCheckBox.class.isAssignableFrom(aClass))
- ((JCheckBox) val).setSelected(false);
- else if (JComboBox.class.isAssignableFrom(aClass))
- ((JComboBox) val).setSelectedIndex(-1);
- }
- }
-
- /**
- * Refresh dialog and process data binding for given keys
- *
- * @param dial jaxx dialog
- * @param keyFirst first to refresh
- * @param keys keys to refresh
- */
- public static void refresh(JAXXObject dial, String keyFirst, String... k=
eys) {
- if (!IDialog.class.isAssignableFrom(dial.getClass())) return;
-
- IDialog dialog =3D (IDialog) dial;
- dialog.getOk().setEnabled(dialog.isOkEnabled());
- dial.processDataBinding(keyFirst);
- for (String key : keys) dial.processDataBinding(key);
- dialog.repaint();
- }
-}
-
Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2015-0=
5-07 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2015-0=
5-07 09:51:50 UTC (rev 4221)
@@ -1,88 +0,0 @@
-
-
-
- java.awt.Color
-
-
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
=20
-
- |
-
-
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI=
.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx=
2015-05-07 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx=
2015-05-07 09:51:50 UTC (rev 4221)
@@ -1,94 +0,0 @@
-
-
-
- java.awt.Color
-
-
-
-
- |
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
-
-
-
-
- |
-
-
-
Deleted: trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2015-0=
5-07 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2015-0=
5-07 09:51:50 UTC (rev 4221)
@@ -1,187 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- |
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
-
-
-
- |
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
-
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
- |
-
-
-
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2015-05-0=
7 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2015-05-0=
7 09:51:50 UTC (rev 4221)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+ Copyright (C) 2009 - 2015 Ifremer, CodeLutin
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.=
jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2=
015-05-07 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2=
015-05-07 09:51:50 UTC (rev 4221)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+ Copyright (C) 2009 - 2015 Ifremer, CodeLutin
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx 2015-=
05-07 09:43:46 UTC (rev 4220)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx 2015-=
05-07 09:51:50 UTC (rev 4221)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+ Copyright (C) 2009 - 2015 Ifremer, CodeLutin
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
--===============5397586141206783641==--