Author: glandais Date: 2008-02-22 16:54:05 +0000 (Fri, 22 Feb 2008) New Revision: 1203 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java Log: Commenting for compiling, but lots of FIXME !!! Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-22 16:53:26 UTC (rev 1202) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-22 16:54:05 UTC (rev 1203) @@ -56,23 +56,25 @@ // and we are sure to be on detail tab DetailTabModel model = (DetailTabModel) getModel(); Integer selectedAttachment = model.getSelectedAttachmentIndex(); - attachment = selected.getMeta().getAttachment(selectedAttachment); - if (attachment == null) { - return null; - } - // ask user path where to save data - String dir = FileUtil.getDirectory(_("simexplorer.action.download.attachment", attachment.getFileName(), selected.getMeta().getName() + " [" + selected.getVersion() + "]"), _("simexplorer.choose.dir")); - if (dir == null) { - // user cancel action - return null; - } - File parent = new File(dir); - if (!parent.exists()) { - parent.mkdirs(); - } - File file; - file = new File(parent, attachment.getFileName()); - return file; + // FIXME !!! + return null; +// attachment = selected.getLe(context) getAttachment(selectedAttachment); +// if (attachment == null) { +// return null; +// } +// // ask user path where to save data +// String dir = FileUtil.getDirectory(_("simexplorer.action.download.attachment", attachment.getFileName(), selected.getMeta().getName() + " [" + selected.getVersion() + "]"), _("simexplorer.choose.dir")); +// if (dir == null) { +// // user cancel action +// return null; +// } +// File parent = new File(dir); +// if (!parent.exists()) { +// parent.mkdirs(); +// } +// File file; +// file = new File(parent, attachment.getFileName()); +// return file; } protected BufferedInputStream getInputStream() { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-22 16:53:26 UTC (rev 1202) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-22 16:54:05 UTC (rev 1203) @@ -165,7 +165,7 @@ } else { versions = StorageServiceHelper.getVersions(getContext(), model.isRemote(), element.getMetaData().getUuid()); selectedVersion = element.getMetaData().getVersion(); - selectedAttachment = element.getMetaData().getAttachments().isEmpty() ? null : 0; + selectedAttachment = element.getAttachments().isEmpty() ? null : 0; } model.setVersions(versions); @@ -256,7 +256,9 @@ selectedVersion.toString() ); - selectedAttachment = metas.getAttachments().isEmpty() ? null : 0; + // FIXME !!! + selectedAttachment = null; +// selectedAttachment = metas.getAttachments().isEmpty() ? null : 0; model.setDetail(metas); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-22 16:53:26 UTC (rev 1202) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-22 16:54:05 UTC (rev 1203) @@ -98,7 +98,9 @@ } public Attachment getSelectedAttachment() { - return selectedAttachmentIndex == null || selectedAttachmentIndex == -1 ? null : getDetail().getAttachment(selectedAttachmentIndex); + // FIXME !!! + return null; +// return selectedAttachmentIndex == null || selectedAttachmentIndex == -1 ? null : getDetail().getAttachment(selectedAttachmentIndex); } public Version getSelectedVersion(int integer) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java 2008-02-22 16:53:26 UTC (rev 1202) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabRefreshHelper.java 2008-02-22 16:54:05 UTC (rev 1203) @@ -38,6 +38,7 @@ import java.awt.Dimension; import java.awt.Rectangle; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** @@ -199,7 +200,9 @@ ui.getDetailVersions().setSelectedIndex(index); } ui.getDetailHeader().setText(selectedNode.getMetaData().getName()); - ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", detail.getDescriptors().size())); + // FIXME !!! +// ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", detail.getDescriptors().size())); + ui.getDetailDescriptorsHeader().setText(_("simexplorer.node.descriptors", 0)); ui.getDetailType().setText(EntityHelper.Type.getLibelle(detail)); String s = detail.getDescription(); String tooltip = s; @@ -213,10 +216,14 @@ ui.getDetailCreationDate().setText(DATE_FORMAT.format(detail.getCreationDate())); ui.getDetail().setVisible(true); JTable table = ui.getDetailTable(); - ((DetailTableModel) table.getModel()).setData(detail); + // FIXME !!! + ((DetailTableModel) table.getModel()).setData(null); +// ((DetailTableModel) table.getModel()).setData(detail); int nbDescriptorRows = table.getRowCount(); - List<Attachment> attachments = detail.getAttachments(); + // FIXME !!! +// List<Attachment> attachments = detail.getAttachments(); + List<Attachment> attachments = new ArrayList<Attachment>(); JList listAttachments = ui.getDetailAttachments(); DefaultListModel listModel = (DefaultListModel) listAttachments.getModel(); listModel.setSize(0);