From f3d838f322136a4eb9cab9ed7ba85b074dbb100c Mon Sep 17 00:00:00 2001
From: Arthur Coolen <coolen@astron.nl>
Date: Tue, 11 Jul 2006 14:18:41 +0000
Subject: [PATCH] BugID: 604 upload file to /tmp diR added configPanelHelper
---
.../sas/otb/panels/ComponentMaintenancePanel.java | 2 +-
.../nl/astron/lofar/sas/otb/panels/MainPanel.java | 12 +++++++-----
.../sas/otb/panels/TemplateMaintenancePanel.java | 15 ++++++++++-----
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
index 0f9ddf1fc8a..80215bd9975 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
@@ -34,7 +34,7 @@ import nl.astron.lofar.sas.otbcomponents.VICnodeDefViewPanel;
import org.apache.log4j.Logger;
/**
- * Class that will show the components to the user, all component actions can be
+ Class that will show the components to the user, all component actions can be
* handled from within this Gui panel.
*
* @created 24-01-2006
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java
index 63392444dfe..8c592f40596 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java
@@ -430,12 +430,13 @@ public class MainPanel extends javax.swing.JPanel
BufferedInputStream input = new BufferedInputStream(new FileInputStream(itsNewFile));
input.read(uldata,0,uldata.length);
input.close();
- if (itsMainFrame.getSharedVars().getOTDBrmi().getRemoteFileTrans().uploadFile(uldata,itsNewFile.getName())) {
+ String aFileName= "/tmp/"+itsMainFrame.getUserAccount().getUserName()+"_"+itsNewFile.getName();
+ if (itsMainFrame.getSharedVars().getOTDBrmi().getRemoteFileTrans().uploadFile(uldata,aFileName)) {
logger.debug("upload finished");
// Create a new Tree from the found file.
- int aTreeID=itsMainFrame.getSharedVars().getOTDBrmi().getRemoteMaintenance().loadMasterFile(itsNewFile.getPath());
+ int aTreeID=itsMainFrame.getSharedVars().getOTDBrmi().getRemoteMaintenance().loadMasterFile(aFileName);
if (aTreeID < 1) {
- logger.debug("Error on fileLoad: " + itsNewFile.getPath());
+ logger.debug("Error on fileLoad: " + aFileName);
} else {
// set changed flag to reload mainpanel
itsMainFrame.setChanged(this.getFriendlyName(),true);
@@ -651,10 +652,11 @@ public class MainPanel extends javax.swing.JPanel
BufferedInputStream input = new BufferedInputStream(new FileInputStream(itsNewFile));
input.read(uldata,0,uldata.length);
input.close();
- if (itsMainFrame.getSharedVars().getOTDBrmi().getRemoteFileTrans().uploadFile(uldata,itsNewFile.getName())) {
+ String aFileName= "/tmp/"+itsMainFrame.getUserAccount().getUserName()+"_"+itsNewFile.getName();
+ if (itsMainFrame.getSharedVars().getOTDBrmi().getRemoteFileTrans().uploadFile(uldata,aFileName)) {
logger.debug("upload finished");
// Create a new Tree from the found file.
- int anID=itsMainFrame.getSharedVars().getOTDBrmi().getRemoteMaintenance().loadComponentFile(itsNewFile.getName());
+ int anID=itsMainFrame.getSharedVars().getOTDBrmi().getRemoteMaintenance().loadComponentFile(aFileName);
if (anID < 1) {
logger.debug("Error on ComponentfileLoad: " + itsNewFile.getPath());
} else {
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
index bba0a05d1fc..2ae14ba013a 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
@@ -29,10 +29,12 @@ import javax.swing.JComponent;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
+import nl.astron.lofar.lofarutils.LofarUtils;
import nl.astron.lofar.sas.otb.MainFrame;
import nl.astron.lofar.sas.otb.jotdb2.jOTDBnode;
import nl.astron.lofar.sas.otb.jotdb2.jOTDBparam;
import nl.astron.lofar.sas.otb.jotdb2.jOTDBtree;
+import nl.astron.lofar.sas.otb.util.ConfigPanelHelper;
import nl.astron.lofar.sas.otb.util.IViewPanel;
import nl.astron.lofar.sas.otb.util.UserAccount;
import nl.astron.lofar.sas.otb.util.treemanagers.OTDBNodeTreeManager;
@@ -300,11 +302,12 @@ public class TemplateMaintenancePanel extends javax.swing.JPanel
jTabbedPane1.removeAll();
// Check if the nodename uses specific panels and create them
- Vector<String> aPanelList=new Vector<String>();
- //generic node panel
- aPanelList.add("nl.astron.lofar.sas.otbcomponents.NodeViewPanel");
- //generic parameter panel
- aPanelList.add("nl.astron.lofar.sas.otbcomponents.ParameterViewPanel");
+ Vector aPanelList=null;
+ if (itsPanelHelper.isKey(LofarUtils.keyName(aNode.name))) {
+ aPanelList=itsPanelHelper.getPanels(LofarUtils.keyName(aNode.name));
+ } else {
+ aPanelList=itsPanelHelper.getPanels("*");
+ }
// Loop through all the panels and fill the tabPanel with them
@@ -373,6 +376,8 @@ public class TemplateMaintenancePanel extends javax.swing.JPanel
// keep the TreeId that belongs to this panel
private int itsTreeID = 0;
private boolean changed = false;
+
+ private ConfigPanelHelper itsPanelHelper=ConfigPanelHelper.getConfigPanelHelper();
// Variables declaration - do not modify//GEN-BEGIN:variables
private nl.astron.lofar.sas.otbcomponents.ButtonPanel buttonPanel1;
--
GitLab