Menu
▾
▴
gpe4gtk-cvs-commits — Information on the project repository updates
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(899) |
Aug
(493) |
Sep
(542) |
Oct
(674) |
Nov
(365) |
Dec
(906) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(159) |
Feb
(547) |
Mar
(583) |
Apr
(775) |
May
(1169) |
Jun
(809) |
Jul
(287) |
Aug
(629) |
Sep
(734) |
Oct
(952) |
Nov
(493) |
Dec
(493) |
| 2007 |
Jan
(292) |
Feb
(1007) |
Mar
(137) |
Apr
(19) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Nikolay M. <nbm...@us...> - 2007-03-18 13:20:48
|
Update of /cvsroot/gpe4gtk/gpe4gtk/tests In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7387/tests Modified Files: GUI_run.xml Log Message: Add <jvmarg value="-Xmx512m"/> for testing Expert Client Index: GUI_run.xml =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/tests/GUI_run.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** GUI_run.xml 26 Jan 2007 14:12:19 -0000 1.16 --- GUI_run.xml 17 Mar 2007 14:11:31 -0000 1.17 *************** *** 225,228 **** --- 225,229 ---- classname="com.intel.gpe.tests.gui.GUITestStarter" dir="${basedir}/secure"> + <jvmarg value="-Xmx512m"/> <arg line="sec abbot ExpertClient exp ExpertClientStart.xml"/> </java> |
|
From: Nikolay M. <nbm...@us...> - 2007-03-18 13:18:32
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gui/controls In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6031/clients/src/com/intel/gui/controls Modified Files: IntTextField.java Log Message: additional fix for feature request [ 1677155 ] Text fields are too wide Index: IntTextField.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gui/controls/IntTextField.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IntTextField.java 9 Mar 2007 11:51:45 -0000 1.2 --- IntTextField.java 17 Mar 2007 14:08:12 -0000 1.3 *************** *** 112,123 **** */ public IntTextField(int start, int min, int max) { ! ! super(new IntDocument(min, max), new Integer(start).toString(), Math.max(("" + min).length(), ("" + max) ! .length()) * 3 / 4); ! ! this.min = min; ! this.max = max; ! ! this.addFocusListener(new FieldFocusAdapter(this)); } --- 112,116 ---- */ public IntTextField(int start, int min, int max) { ! this((start + ""), min, max); } *************** *** 135,140 **** public IntTextField(String text, int min, int max) { ! super(new IntDocument(min, max), text, Math.max(("" + min).length(), ("" + max).length()) * 3 / 4); ! this.min = min; this.max = max; --- 128,134 ---- public IntTextField(String text, int min, int max) { ! super(new IntDocument(min, max), text, 3); ! int column = Math.max(("" + min).length(), ("" + max).length()); ! setColumns(column > 2 ? column * 3 / 4 : column); this.min = min; this.max = max; *************** *** 165,169 **** // convert min and max to String by adding "" ! setColumns(Math.max(("" + min).length(), ("" + max).length()) * 3 / 4); ((IntDocument) getDocument()).setMaximum(max); } --- 159,164 ---- // convert min and max to String by adding "" ! int column = Math.max(("" + min).length(), ("" + max).length()); ! setColumns(column > 2 ? column * 3 / 4 : column); ((IntDocument) getDocument()).setMaximum(max); } *************** *** 179,183 **** // convert min and max to String by adding "" ! setColumns(Math.max(("" + min).length(), ("" + max).length()) * 3 / 4); ((IntDocument) getDocument()).setMinimum(min); } --- 174,179 ---- // convert min and max to String by adding "" ! int column = Math.max(("" + min).length(), ("" + max).length()); ! setColumns(column > 2 ? column * 3 / 4 : column); ((IntDocument) getDocument()).setMinimum(min); } |
|
From: Nikolay M. <nbm...@us...> - 2007-03-18 12:26:19
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/common/panels/fileimports/common In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27784/clients/src/com/intel/gpe/client2/common/panels/fileimports/common Modified Files: LocalDirectoryPanel.java Log Message: fix for bug [ 1682562 ] Bug in LocalDirectoryPanel Index: LocalDirectoryPanel.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/common/panels/fileimports/common/LocalDirectoryPanel.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** LocalDirectoryPanel.java 27 Feb 2007 13:13:00 -0000 1.12 --- LocalDirectoryPanel.java 17 Mar 2007 06:34:39 -0000 1.13 *************** *** 132,137 **** return false; } ! // file.getAbsolutePath() ! getElementWrapper().setBaseDir(pathField.getText()); getElementWrapper().setTargetSystem(null); getElementWrapper().setFileSystemName(null); --- 132,136 ---- return false; } ! getElementWrapper().setBaseDir(file.getAbsolutePath()); getElementWrapper().setTargetSystem(null); getElementWrapper().setFileSystemName(null); |
|
From: Maxim L. <mlu...@us...> - 2007-03-16 14:42:55
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/panels In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22258/clients/src/com/intel/gpe/client2/expert/workfloweditor/panels Modified Files: GBFileImportEditorFramePanel.java Log Message: Direct File Set Import GUI Part implemented Index: GBFileImportEditorFramePanel.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/panels/GBFileImportEditorFramePanel.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** GBFileImportEditorFramePanel.java 20 Feb 2007 15:46:43 -0000 1.27 --- GBFileImportEditorFramePanel.java 16 Mar 2007 14:42:43 -0000 1.28 *************** *** 167,172 **** else { if (parameter.getType() == GridBeanParameterType.FILE_SET) { ! dialog = new GBFileSetImportEntryDialog(this, ExpertNodes.GBFileSetImportEntryDialog, variableManager, variables, ! gbJob.getModel(), parameter, elementView.getElement().getGridBeanPlugin(), messageAdapter); } else { --- 167,173 ---- else { if (parameter.getType() == GridBeanParameterType.FILE_SET) { ! dialog = new GBFileSetImportEntryDialog(this, asyncClient, listClient, ExpertNodes.GBFileSetImportEntryDialog, ! variableManager, variables, gbJob.getModel(), parameter, ! elementView.getElement().getGridBeanPlugin(), messageAdapter); } else { |
|
From: Maxim L. <mlu...@us...> - 2007-03-16 14:42:55
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22258/clients/src/com/intel/gpe/client2/expert/workfloweditor Modified Files: AtomicGridBeanJob.java Log Message: Direct File Set Import GUI Part implemented Index: AtomicGridBeanJob.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/AtomicGridBeanJob.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** AtomicGridBeanJob.java 26 Dec 2006 08:29:54 -0000 1.31 --- AtomicGridBeanJob.java 16 Mar 2007 14:42:43 -0000 1.32 *************** *** 42,45 **** --- 42,46 ---- import org.w3c.dom.Text; + import com.intel.gpe.client2.common.filesets.ClientFileSet; import com.intel.gpe.client2.common.utils.RemoteGPEFile; import com.intel.gpe.client2.expert.i18n.Messages; *************** *** 145,149 **** // array of files j is not changed, so there could be a serious problem in // importing after array single file. So the correct way to fix this problem ! // is to change mechanism of setting up import for single files. //mlukichev Object value = model.get(param.getName()); if (value instanceof InputFileParameterValue) { --- 146,150 ---- // array of files j is not changed, so there could be a serious problem in // importing after array single file. So the correct way to fix this problem ! // is to change mechanism of setup import for single files. //mlukichev Object value = model.get(param.getName()); if (value instanceof InputFileParameterValue) { *************** *** 194,205 **** dss.setupImport(dataStaging, storage, localFile.getWorkflowTargetSystemPath()); } - } else if (value instanceof InputFileSetParameterValue) { InputFileSetParameterValue fileSet = (InputFileSetParameterValue) value; if (fileSet.getValue() instanceof AtomicGPEFileSetValue) { AtomicGPEFileSetValue fsValue = (AtomicGPEFileSetValue) fileSet.getValue(); - String targetSystemPath = fileSet.getTargetSystemPath(); - Variable jobDescription = atomicJob.getJobDefinition().derive("/jsdl:JobDescription"); VariableManager variableManager = fsValue.getVariableManager(); for (Pair<String, QName> vt : fsValue.getVariables()) { --- 195,205 ---- dss.setupImport(dataStaging, storage, localFile.getWorkflowTargetSystemPath()); } } else if (value instanceof InputFileSetParameterValue) { InputFileSetParameterValue fileSet = (InputFileSetParameterValue) value; + String targetSystemPath = fileSet.getTargetSystemPath(); + Variable jobDescription = atomicJob.getJobDefinition().derive("/jsdl:JobDescription"); if (fileSet.getValue() instanceof AtomicGPEFileSetValue) { AtomicGPEFileSetValue fsValue = (AtomicGPEFileSetValue) fileSet.getValue(); VariableManager variableManager = fsValue.getVariableManager(); for (Pair<String, QName> vt : fsValue.getVariables()) { *************** *** 231,236 **** } } } - } } --- 231,239 ---- } } + + /*for (Pair<String, ClientFileSet> fs: fsValue.getFileSets()){ + + }*/ } } } |
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/dialogs In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22258/clients/src/com/intel/gpe/client2/expert/workfloweditor/dialogs Modified Files: GBFSElementEntryDialog.java FileSetListCellRenderer.java GBFileSetImportEntryDialog.java Log Message: Direct File Set Import GUI Part implemented Index: FileSetListCellRenderer.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/dialogs/FileSetListCellRenderer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileSetListCellRenderer.java 3 Nov 2006 10:12:05 -0000 1.1 --- FileSetListCellRenderer.java 16 Mar 2007 14:42:43 -0000 1.2 *************** *** 41,44 **** --- 41,45 ---- import javax.xml.namespace.QName; + import com.intel.gpe.client2.common.filesets.ClientFileSet; import com.intel.gpe.client2.common.img.Icons; import com.intel.gpe.client2.expert.workfloweditor.VariableManager; *************** *** 60,69 **** public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean hasFocus) { ! Pair<String, QName> vt = (Pair<String, QName>)value; ! String text = "Name: " + vt.getM2().getLocalPart() + "; Path: " + vt.getM1(); ! WorkflowVariable wv = variableManager.get(vt.getM2()); Icon icon = null; ! if (wv != null) ! icon = createIcon(getIconPath(wv.getType())); JLabel label = (JLabel) super.getListCellRendererComponent(list, text, index, isSelected, hasFocus); label.setIcon(icon); --- 61,81 ---- public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean hasFocus) { ! Pair<String, Object> vt = (Pair<String, Object>)value; ! Object m2 = vt.getM2(); ! String name = ""; Icon icon = null; ! if (m2 instanceof ClientFileSet){ ! ClientFileSet fs = (ClientFileSet)vt.getM2(); ! if (fs != null){ ! name += fs.getDisplayValue(); ! icon = createIcon(getIconPath(GridBeanParameterType.FILE_SET)); ! } ! } else if (m2 instanceof QName){ ! WorkflowVariable wv = variableManager.get((QName)m2); ! if (wv != null) ! icon = createIcon(getIconPath(wv.getType())); ! } ! String text = "Name: " + name + "; Path: " + vt.getM1(); ! JLabel label = (JLabel) super.getListCellRendererComponent(list, text, index, isSelected, hasFocus); label.setIcon(icon); Index: GBFSElementEntryDialog.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/dialogs/GBFSElementEntryDialog.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GBFSElementEntryDialog.java 20 Feb 2007 15:46:53 -0000 1.6 --- GBFSElementEntryDialog.java 16 Mar 2007 14:42:43 -0000 1.7 *************** *** 39,52 **** import java.awt.event.ActionListener; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; - import javax.swing.border.TitledBorder; import javax.xml.namespace.QName; import com.intel.gpe.client2.adapters.MessageAdapter; import com.intel.gpe.client2.common.panels.wrappers.OKCancelPanel; import com.intel.gpe.client2.defaults.preferences.INode; import com.intel.gpe.client2.expert.i18n.Messages; import com.intel.gpe.client2.expert.i18n.MessagesKeys; --- 39,60 ---- import java.awt.event.ActionListener; + import javax.swing.AbstractAction; + import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; import javax.xml.namespace.QName; + import com.intel.gpe.client2.AsyncClient; + import com.intel.gpe.client2.ListClient; import com.intel.gpe.client2.adapters.MessageAdapter; + import com.intel.gpe.client2.common.filesets.ClientFileSet; import com.intel.gpe.client2.common.panels.wrappers.OKCancelPanel; + import com.intel.gpe.client2.common.panels.wrappers.OKCancelWrapper; + import com.intel.gpe.client2.common.panels.wrappers.RadioButtonOKCancelPanelGroup; + import com.intel.gpe.client2.common.tables.fileimports.panels.FileSetPanel; import com.intel.gpe.client2.defaults.preferences.INode; + import com.intel.gpe.client2.expert.ExpertNodes; import com.intel.gpe.client2.expert.i18n.Messages; import com.intel.gpe.client2.expert.i18n.MessagesKeys; *************** *** 54,57 **** --- 62,66 ---- import com.intel.gpe.client2.expert.workfloweditor.VariableManager; import com.intel.gpe.client2.expert.workfloweditor.variables.WorkflowVariable; + import com.intel.gpe.client2.panels.GPEPanelResult; import com.intel.gpe.gridbeans.GridBeanParameterType; import com.intel.gui.controls2.configurable.ConfigurablePanel; *************** *** 60,77 **** /** * @version $Id$ * @author Max Lukichev */ public class GBFSElementEntryDialog extends ConfigurablePanel implements OKCancelPanel { - private JComboBox newValueCombo; - - private JTextField pathField; private VariableManager variableManager; private VariableList variables; private MessageAdapter messageAdapter; ! private Pair<String, QName> value; ! ! public GBFSElementEntryDialog(IConfigurable parent, INode node, VariableManager variableManager, ! VariableList variables, Pair<String, QName> value, MessageAdapter messageAdapter) { super(parent, node); this.value = value; --- 69,90 ---- /** + * The Dialog for specifying File Import Entry such as Workflow Variable + * or direct file set + * * @version $Id$ * @author Max Lukichev */ public class GBFSElementEntryDialog extends ConfigurablePanel implements OKCancelPanel { private VariableManager variableManager; private VariableList variables; private MessageAdapter messageAdapter; ! private Pair<String, Object> value; ! private RadioButtonOKCancelPanelGroup<OKCancelPanel> group; ! private AsyncClient asyncClient; ! private ListClient listClient; ! ! public GBFSElementEntryDialog(IConfigurable parent, INode node, AsyncClient asyncClient, ! ListClient listClient, VariableManager variableManager, VariableList variables, ! Pair<String, Object> value, MessageAdapter messageAdapter) { super(parent, node); this.value = value; *************** *** 79,83 **** this.variables = variables; this.messageAdapter = messageAdapter; ! buildComponents(); } --- 92,98 ---- this.variables = variables; this.messageAdapter = messageAdapter; ! this.asyncClient = asyncClient; ! this.listClient = listClient; ! buildComponents(); } *************** *** 87,159 **** */ private void buildComponents() { ! // JLabel descLabel = new JLabel(description); ! JLabel pathLabel = new JLabel(Messages ! .getString(MessagesKeys.expert_workfloweditor_dialogs_GBFSElementEntryDialog_Path)); ! JLabel nameLabel = new JLabel(Messages ! .getString(MessagesKeys.expert_workfloweditor_dialogs_GBFileImportEntryDialog_Name)); ! ! JPanel centerPanel = new JPanel(); ! centerPanel.setBorder(new TitledBorder("")); ! pathField = new JTextField(); ! if (value != null) ! pathField.setText(value.getM1()); ! newValueCombo = createCombo(); ! ! GridBagLayout g = new GridBagLayout(); ! centerPanel.setLayout(g); ! ! GridBagConstraints c = new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.NORTH, ! GridBagConstraints.NONE, new Insets(1, 1, 1, 1), 0, 0); ! centerPanel.add(nameLabel, c); ! ! c = new GridBagConstraints(1, 0, 4, 1, 1.0, 0.0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, ! new Insets(1, 1, 1, 1), 0, 0); ! centerPanel.add(newValueCombo, c); ! ! c = new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.NORTH, GridBagConstraints.NONE, new Insets( ! 1, 1, 1, 1), 0, 0); ! centerPanel.add(pathLabel, c); ! ! c = new GridBagConstraints(1, 1, 4, 1, 1.0, 0.0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, ! new Insets(1, 1, 1, 17), 0, 0); ! centerPanel.add(pathField, c); ! setLayout(new BorderLayout()); ! add(centerPanel, BorderLayout.CENTER); } ! private JComboBox createCombo() { ! JComboBox combo = new JComboBox(); ! combo.addItem(""); ! for (QName vt : variables) { ! // currently all variables included ! combo.addItem(vt.getLocalPart()); ! } ! if (value != null) ! combo.setSelectedItem(value.getM2().getLocalPart()); ! else ! combo.setSelectedItem(""); ! ! combo.addActionListener(new ActionListener() { ! public void actionPerformed(ActionEvent e) { ! JComboBox combo = (JComboBox) e.getSource(); ! Object selection = combo.getSelectedItem(); ! if (selection == null) ! return; ! QName name = new QName((String) selection); ! WorkflowVariable wv = variableManager.get(name); ! if (wv == null) ! return; ! GridBeanParameterType type = wv.getType(); ! if (type == GridBeanParameterType.FILE_SET) { ! pathField.setText(""); ! } ! else if (type == GridBeanParameterType.GPE_FILE) { ! pathField.setText(name.getLocalPart()); ! } ! } ! }); ! return combo; ! } /** --- 102,134 ---- */ private void buildComponents() { ! group = new RadioButtonOKCancelPanelGroup<OKCancelPanel>(); ! ! Pair<String,QName> varModel = null; ! Pair<String, ClientFileSet> fsModel = null; ! if (value != null){ ! Object m2 = value.getM2(); ! if (m2 instanceof QName){ ! varModel = new Pair<String, QName>(value.getM1(), (QName)m2); ! } else if (m2 instanceof ClientFileSet){ ! fsModel = new Pair<String, ClientFileSet>(value.getM1(), (ClientFileSet)m2); ! } ! } ! ! boolean fsSelected = false; ! if (fsModel != null){ ! fsSelected = true; ! } ! ! WorkflowVarPanel varPanel = new WorkflowVarPanel(varModel); ! ! FileSetVarPanel fileSetPanel = new FileSetVarPanel(fsModel); ! group.add(varPanel, "Workflow Variable", !fsSelected); ! group.add(fileSetPanel, "File Set", fsSelected); ! setLayout(new BorderLayout()); ! add(group.getComponent(), BorderLayout.CENTER); } ! /** *************** *** 163,195 **** * file set */ ! public Pair<String, QName> getValue() { return value; } public boolean applyValues() { ! if (newValueCombo.getSelectedItem() == null || newValueCombo.getSelectedItem().equals("")) ! return false; ! ! String comboValue = (String) newValueCombo.getSelectedItem(); ! QName name = new QName(comboValue); ! WorkflowVariable wv = variableManager.get(name); ! if (wv == null) return false; ! GridBeanParameterType type = wv.getType(); ! if (type == GridBeanParameterType.GPE_FILE) { ! if (pathField.getText().equals("")) ! return false; ! } ! else if (type == GridBeanParameterType.URL) { ! if (pathField.getText().equals("")) ! return false; } - String path = pathField.getText(); - value = new Pair<String, QName>(path, name); return true; } public boolean cancelValues() { ! return true; } --- 138,171 ---- * file set */ ! public Pair<String, Object> getValue() { return value; } public boolean applyValues() { ! if (!group.getSelectedPanel().applyValues()) return false; ! ! if (group.getSelectedPanel() instanceof WorkflowVarPanel){ ! WorkflowVarPanel wp = (WorkflowVarPanel)group.getSelectedPanel(); ! Pair<String, QName> res = wp.getVal(); ! if (res == null){ ! value = null; ! } else { ! value = new Pair<String, Object>(res.getM1(), res.getM2()); ! } ! } else if (group.getSelectedPanel() instanceof FileSetVarPanel){ ! FileSetVarPanel fp = (FileSetVarPanel)group.getSelectedPanel(); ! Pair<String, ClientFileSet> res = fp.getVal(); ! if (res == null){ ! value = null; ! } else { ! value = new Pair<String, Object>(res.getM1(), res.getM2()); ! } } return true; } public boolean cancelValues() { ! return group.getSelectedPanel().cancelValues(); } *************** *** 197,200 **** --- 173,417 ---- return this; } + + + private class WorkflowVarPanel extends JPanel implements OKCancelPanel{ + private JComboBox newValueCombo; + private JTextField pathField; + private Pair<String, QName> val; + private JLabel nameLabel; + private JLabel pathLabel; + + public WorkflowVarPanel(Pair<String, QName> value){ + this.val = value; + buildComponents(); + } + + private void buildComponents(){ + // JLabel descLabel = new JLabel(description); + pathLabel = new JLabel(Messages + .getString(MessagesKeys.expert_workfloweditor_dialogs_GBFSElementEntryDialog_Path)); + nameLabel = new JLabel(Messages + .getString(MessagesKeys.expert_workfloweditor_dialogs_GBFileImportEntryDialog_Name)); + pathField = new JTextField(); + if (val != null) + pathField.setText(val.getM1()); + newValueCombo = createCombo(); + + GridBagLayout g = new GridBagLayout(); + setLayout(g); + + GridBagConstraints c = new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.NORTH, + GridBagConstraints.NONE, new Insets(1, 1, 1, 1), 0, 0); + add(nameLabel, c); + + c = new GridBagConstraints(1, 0, 4, 1, 1.0, 0.0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0); + add(newValueCombo, c); + + c = new GridBagConstraints(0, 1, 1, 1, 0.0, 1.0, GridBagConstraints.NORTH, GridBagConstraints.NONE, + new Insets(1, 1, 1, 1), 0, 0); + add(pathLabel, c); + + c = new GridBagConstraints(1, 1, 4, 1, 1.0, 1.0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 17), 0, 0); + add(pathField, c); + } + + private JComboBox createCombo() { + JComboBox combo = new JComboBox(); + combo.addItem(""); + for (QName vt : variables) { + // currently all variables included + combo.addItem(vt.getLocalPart()); + } + if (val != null) + combo.setSelectedItem(val.getM2().getLocalPart()); + else + combo.setSelectedItem(""); + + combo.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + JComboBox combo = (JComboBox) e.getSource(); + Object selection = combo.getSelectedItem(); + if (selection == null) + return; + QName name = new QName((String) selection); + WorkflowVariable wv = variableManager.get(name); + if (wv == null) + return; + GridBeanParameterType type = wv.getType(); + if (type == GridBeanParameterType.FILE_SET) { + pathField.setText(""); + } + else if (type == GridBeanParameterType.GPE_FILE) { + pathField.setText(name.getLocalPart()); + } + } + }); + return combo; + } + + public boolean applyValues() { + if (newValueCombo.getSelectedItem() == null || newValueCombo.getSelectedItem().equals("")) + return false; + + String comboValue = (String) newValueCombo.getSelectedItem(); + QName name = new QName(comboValue); + WorkflowVariable wv = variableManager.get(name); + if (wv == null) + return false; + GridBeanParameterType type = wv.getType(); + if (type == GridBeanParameterType.GPE_FILE) { + if (pathField.getText().equals("")) + return false; + } + else if (type == GridBeanParameterType.URL) { + if (pathField.getText().equals("")) + return false; + } + String path = pathField.getText(); + val = new Pair<String, QName>(path, name); + + return true; + } + + public boolean cancelValues() { + return true; + } + + public Component getComponent() { + return this; + } + + public Pair<String, QName> getVal() { + return val; + } + + @Override + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + newValueCombo.setEnabled(enabled); + nameLabel.setEnabled(enabled); + pathLabel.setEnabled(enabled); + pathField.setEnabled(enabled); + } + } + + private class FileSetVarPanel extends JPanel implements OKCancelPanel{ + private JTextField pathField; + private JTextField fsField; + private JLabel pathLabel; + private JLabel fsLabel; + private Pair<String, ClientFileSet> val; + private JButton editButton; + + public FileSetVarPanel(Pair<String, ClientFileSet> val){ + this.val = val; + buildComponents(); + } + + private void buildComponents(){ + pathLabel = new JLabel(Messages + .getString(MessagesKeys.expert_workfloweditor_dialogs_GBFSElementEntryDialog_Path)); + fsLabel = new JLabel(Messages + .getString(MessagesKeys.expert_workfloweditor_dialogs_GBFileExportEntryDialog_Name)); + pathField = new JTextField(); + fsField = new JTextField(); + fsField.setEditable(false); + if (val != null){ + pathField.setText(value.getM1()); + ClientFileSet fileSet = val.getM2(); + if (fileSet != null) + fsField.setText(fileSet.getDisplayValue()); + } + + editButton = new JButton(new AbstractAction(Messages.getString(MessagesKeys.expert_workfloweditor_dialogs_GBFileSetImportEntryDialog_Edit)){ + public void actionPerformed(ActionEvent e) { + ClientFileSet fs = null; + if (val != null) + fs = val.getM2(); + editFileSet(fs); + } + }); + + GridBagLayout g = new GridBagLayout(); + setLayout(g); + + GridBagConstraints c = new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.NORTH, + GridBagConstraints.NONE, new Insets(1, 1, 1, 1), 0, 0); + add(pathLabel, c); + + c = new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0); + add(pathField, c); + + c = new GridBagConstraints(0, 1, 1, 1, 0.0, 1.0, GridBagConstraints.NORTH, GridBagConstraints.NONE, + new Insets(1, 1, 1, 1), 0, 0); + add(fsLabel, c); + + c = new GridBagConstraints(1, 1, 1, 1, 1.0, 1.0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, + new Insets(4, 1, 1, 1), 0, 0); + add(fsField, c); + + c = new GridBagConstraints(2,1, 1,1, 0.0, 1.0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0); + add(editButton, c); + } + + private void editFileSet(ClientFileSet fs){ + FileSetPanel dialog = new FileSetPanel(GBFSElementEntryDialog.this, ExpertNodes.PatternPanel, fs, + asyncClient, listClient, messageAdapter); + OKCancelWrapper wrapper = new OKCancelWrapper(dialog, Messages + .getString(MessagesKeys.expert_workfloweditor_panels_FileImportPanel_Add_File_Import_Entry), dialog); + messageAdapter.show(wrapper); + if (wrapper.getResult() == GPEPanelResult.OK) { + ClientFileSet res = null; + try { + res = (ClientFileSet)dialog.getValue(); + } + catch (Exception e) { + messageAdapter.showException("An error occured while specifying file set", e); + } + + if (val == null) + val = new Pair<String, ClientFileSet>("", null); + val.setM2(res); + fsField.setText(res==null?"":res.getDisplayValue()); + } + } + + public boolean applyValues() { + String path = pathField.getText(); + if (val == null) + return true; + + if (val.getM2() == null) + return false; + val.setM1(path); + return true; + } + + public boolean cancelValues() { + return true; + } + + public Pair<String, ClientFileSet> getVal() { + return val; + } + + public Component getComponent() { + return this; + } + + @Override + public void setEnabled(boolean enabled){ + super.setEnabled(enabled); + fsLabel.setEnabled(enabled); + fsField.setEnabled(enabled); + pathField.setEnabled(enabled); + pathLabel.setEnabled(enabled); + editButton.setEnabled(enabled); + } + } } Index: GBFileSetImportEntryDialog.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/dialogs/GBFileSetImportEntryDialog.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** GBFileSetImportEntryDialog.java 20 Feb 2007 15:46:53 -0000 1.9 --- GBFileSetImportEntryDialog.java 16 Mar 2007 14:42:43 -0000 1.10 *************** *** 45,48 **** --- 45,49 ---- import javax.swing.JList; import javax.swing.JPanel; + import javax.swing.JScrollPane; import javax.swing.ListSelectionModel; import javax.swing.border.TitledBorder; *************** *** 52,55 **** --- 53,58 ---- import javax.xml.namespace.QName; + import com.intel.gpe.client2.AsyncClient; + import com.intel.gpe.client2.ListClient; import com.intel.gpe.client2.adapters.MessageAdapter; import com.intel.gpe.client2.common.panels.wrappers.OKCancelPanel; *************** *** 75,78 **** --- 78,83 ---- /** + * The dialog for selecting input File Set parameters + * * @version $Id$ * @author Max Lukichev *************** *** 100,106 **** // private boolean isWorkflow; private MessageAdapter messageAdapter; ! ! public GBFileSetImportEntryDialog(IConfigurable parent, INode node, VariableManager variableManager, ! VariableList variables, IGridBeanModel gbModel, IGridBeanParameter parameter, GridBeanPlugin plugin, MessageAdapter messageAdapter) { super(parent, node); --- 105,114 ---- // private boolean isWorkflow; private MessageAdapter messageAdapter; ! private AsyncClient asyncClient; ! private ListClient listClient; ! ! public GBFileSetImportEntryDialog(IConfigurable parent, AsyncClient asyncClient, ListClient listClient, ! INode node, VariableManager variableManager, VariableList variables, IGridBeanModel gbModel, ! IGridBeanParameter parameter, GridBeanPlugin plugin, MessageAdapter messageAdapter) { super(parent, node); *************** *** 113,117 **** this.messageAdapter = messageAdapter; this.variables = variables; ! buildComponents(); } --- 121,126 ---- this.messageAdapter = messageAdapter; this.variables = variables; ! this.asyncClient = asyncClient; ! this.listClient = listClient; buildComponents(); } *************** *** 127,131 **** listPanel.setBorder(new TitledBorder(description)); valueList = createValueList(); ! listPanel.add(valueList); GridBagLayout g = new GridBagLayout(); --- 136,141 ---- listPanel.setBorder(new TitledBorder(description)); valueList = createValueList(); ! JScrollPane pane = new JScrollPane(valueList); ! listPanel.add(pane); GridBagLayout g = new GridBagLayout(); *************** *** 253,263 **** public void actionPerformed(ActionEvent e) { ! GBFSElementEntryDialog dialog = new GBFSElementEntryDialog(parent, ExpertNodes.PatternPanel, variableManager, ! variables, null, messageAdapter); OKCancelWrapper wrapper = new OKCancelWrapper(dialog, Messages .getString(MessagesKeys.expert_workfloweditor_panels_FileImportPanel_Add_File_Import_Entry), dialog); messageAdapter.show(wrapper); if (wrapper.getResult() == GPEPanelResult.OK) { ! Pair<String, QName> value = dialog.getValue(); if (value != null) { ((DefaultListModel) valueList.getModel()).addElement(value); --- 263,273 ---- public void actionPerformed(ActionEvent e) { ! GBFSElementEntryDialog dialog = new GBFSElementEntryDialog(parent, ExpertNodes.PatternPanel, asyncClient, ! listClient, variableManager, variables, null, messageAdapter); OKCancelWrapper wrapper = new OKCancelWrapper(dialog, Messages .getString(MessagesKeys.expert_workfloweditor_panels_FileImportPanel_Add_File_Import_Entry), dialog); messageAdapter.show(wrapper); if (wrapper.getResult() == GPEPanelResult.OK) { ! Pair<String, Object> value = dialog.getValue(); if (value != null) { ((DefaultListModel) valueList.getModel()).addElement(value); *************** *** 278,285 **** public void actionPerformed(ActionEvent e) { int idx = valueList.getSelectedIndex(); ! Pair<String, QName> oldValue = (Pair<String, QName>) ((DefaultListModel) valueList.getModel()) .getElementAt(idx); ! GBFSElementEntryDialog dialog = new GBFSElementEntryDialog(null, ExpertNodes.PatternPanel, variableManager, ! variables, oldValue, messageAdapter); OKCancelWrapper wrapper = new OKCancelWrapper(dialog, Messages .getString(MessagesKeys.expert_workfloweditor_panels_FileImportPanel_Edit_File_Import_Entry), --- 288,295 ---- public void actionPerformed(ActionEvent e) { int idx = valueList.getSelectedIndex(); ! Pair oldValue = (Pair) ((DefaultListModel) valueList.getModel()) .getElementAt(idx); ! GBFSElementEntryDialog dialog = new GBFSElementEntryDialog(null, ExpertNodes.PatternPanel, asyncClient, listClient, ! variableManager, variables, oldValue, messageAdapter); OKCancelWrapper wrapper = new OKCancelWrapper(dialog, Messages .getString(MessagesKeys.expert_workfloweditor_panels_FileImportPanel_Edit_File_Import_Entry), *************** *** 287,291 **** messageAdapter.show(wrapper); if (wrapper.getResult() == GPEPanelResult.OK) { ! Pair<String, QName> value = dialog.getValue(); if (value != null) { --- 297,301 ---- messageAdapter.show(wrapper); if (wrapper.getResult() == GPEPanelResult.OK) { ! Pair<String, Object> value = dialog.getValue(); if (value != null) { |
|
From: Maxim L. <mlu...@us...> - 2007-03-16 14:42:55
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/requests In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22258/clients/src/com/intel/gpe/client2/expert/workfloweditor/requests Modified Files: LocalWFGPEFileAccessor.java Log Message: Direct File Set Import GUI Part implemented Index: LocalWFGPEFileAccessor.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/requests/LocalWFGPEFileAccessor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LocalWFGPEFileAccessor.java 6 Feb 2007 11:45:13 -0000 1.5 --- LocalWFGPEFileAccessor.java 16 Mar 2007 14:42:43 -0000 1.6 *************** *** 34,37 **** --- 34,38 ---- import java.util.List; + import com.intel.gpe.client2.common.filesets.ClientFileSet; import com.intel.gpe.client2.common.requests.utils.GPEFileAccessor; import com.intel.gpe.client2.common.requests.utils.LocalGPEFileAccessor; *************** *** 46,49 **** --- 47,52 ---- import com.intel.gpe.gridbeans.IGridBeanParameter; import com.intel.gpe.gridbeans.InputFileParameterValue; + import com.intel.gpe.gridbeans.InputFileSetParameterValue; + import com.intel.gpe.gridbeans.LocalGPEFile; import com.intel.util.sets.Pair; *************** *** 88,94 **** localFiles.add(new Pair<GPEFile, String>(lwf, lwf.getWorkflowTargetSystemPath())); } } } } - } \ No newline at end of file --- 91,103 ---- localFiles.add(new Pair<GPEFile, String>(lwf, lwf.getWorkflowTargetSystemPath())); } + } else if (obj instanceof InputFileSetParameterValue){ + /*InputFileSetParameterValue inputFileSet = (InputFileSetParameterValue) obj; + if (inputFileSet.getValue() instanceof ClientFileSet) { + ClientFileSet fs = (ClientFileSet)inputFileSet.getValue(); + List lft = fs.getLocalTransfers(inputFileSet.getTargetSystemPath()); + localFiles.addAll(lft); + }*/ } } } } \ No newline at end of file |
|
From: Maxim L. <mlu...@us...> - 2007-03-16 14:42:55
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/i18n In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22258/clients/src/com/intel/gpe/client2/expert/i18n Modified Files: MessagesKeys.java Log Message: Direct File Set Import GUI Part implemented Index: MessagesKeys.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/i18n/MessagesKeys.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MessagesKeys.java 15 Dec 2006 11:38:44 -0000 1.9 --- MessagesKeys.java 16 Mar 2007 14:42:43 -0000 1.10 *************** *** 441,448 **** expert_workfloweditor_dialogs_GBFileSetImportEntryDialog_Remove( "expert_workfloweditor_dialogs_GBFileSetImportEntryDialog_Remove"), ! /** Name: */ expert_workfloweditor_dialogs_GBFSElementEntryDialog_Path( "expert_workfloweditor_dialogs_GBFSElementEntryDialog_Path"), ! /** Add File... */ expert_workfloweditor_panels_FileImportPanel_Add_File("expert_workfloweditor_panels_FileImportPanel_Add_File"), /** Add File Import Entry */ --- 441,448 ---- expert_workfloweditor_dialogs_GBFileSetImportEntryDialog_Remove( "expert_workfloweditor_dialogs_GBFileSetImportEntryDialog_Remove"), ! /** Path: */ expert_workfloweditor_dialogs_GBFSElementEntryDialog_Path( "expert_workfloweditor_dialogs_GBFSElementEntryDialog_Path"), ! /** Add File... */ expert_workfloweditor_panels_FileImportPanel_Add_File("expert_workfloweditor_panels_FileImportPanel_Add_File"), /** Add File Import Entry */ |
|
From: Maxim L. <mlu...@us...> - 2007-03-16 14:42:55
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/variables In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22258/clients/src/com/intel/gpe/client2/expert/workfloweditor/variables Modified Files: AtomicGPEFileSetValue.java Log Message: Direct File Set Import GUI Part implemented Index: AtomicGPEFileSetValue.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/variables/AtomicGPEFileSetValue.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AtomicGPEFileSetValue.java 27 Nov 2006 13:38:18 -0000 1.10 --- AtomicGPEFileSetValue.java 16 Mar 2007 14:42:43 -0000 1.11 *************** *** 38,41 **** --- 38,42 ---- import javax.xml.namespace.QName; + import com.intel.gpe.client2.common.filesets.ClientFileSet; import com.intel.gpe.client2.expert.workfloweditor.VariableManager; import com.intel.gpe.gridbeans.IGridBeanParameterValue; *************** *** 50,53 **** --- 51,55 ---- private List<Pair<String, QName>> variables; private VariableManager variableManager; + private List<Pair<String, ClientFileSet>> fileSets; public AtomicGPEFileSetValue(){ *************** *** 73,76 **** --- 75,86 ---- } + public List<Pair<String, ClientFileSet>> getFileSets() { + return fileSets; + } + + public void setFileSets(List<Pair<String, ClientFileSet>> fileSets) { + this.fileSets = fileSets; + } + @XmlTransient public VariableManager getVariableManager() { |
|
From: Maxim L. <mlu...@us...> - 2007-03-16 14:42:55
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/common/tables/fileimports/panels In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22258/clients/src/com/intel/gpe/client2/common/tables/fileimports/panels Modified Files: FileSetPanel.java Log Message: Direct File Set Import GUI Part implemented Index: FileSetPanel.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/common/tables/fileimports/panels/FileSetPanel.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** FileSetPanel.java 20 Feb 2007 15:46:51 -0000 1.21 --- FileSetPanel.java 16 Mar 2007 14:42:43 -0000 1.22 *************** *** 101,105 **** * newTargetSystem; private String newPath; */ - public FileSetPanel(IConfigurable parent, INode name, IGridBeanParameterValue oldValue, AsyncClient asyncClient, ListClient listClient, MessageAdapter messageAdapter) { --- 101,104 ---- |
|
From: Nikolay M. <nbm...@us...> - 2007-03-16 12:58:01
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/gridbeans/pdb2pov/plugin In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14143/clients/src/com/intel/gpe/gridbeans/pdb2pov/plugin Modified Files: OptionsPanel.java Log Message: additional fix for bug [ 1669041 ] Bad method buildComponents in pdb2pov.plugin.OptionsPanel Index: OptionsPanel.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/gridbeans/pdb2pov/plugin/OptionsPanel.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** OptionsPanel.java 27 Feb 2007 09:50:19 -0000 1.21 --- OptionsPanel.java 16 Mar 2007 12:57:51 -0000 1.22 *************** *** 34,38 **** import java.awt.GridBagLayout; - import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JLabel; --- 34,37 ---- *************** *** 52,61 **** public class OptionsPanel extends GridBeanPanel { - private JTextField nameTextField; - private JTextField sourceNameTextField; - private JTextField targetNameTextField; - // private TextEditor textEditor = new TextEditor(); - private JButton browseButton; - // private JTabbedPane tabbedPane; private JCheckBox definitionCheckBox; // -o - Only write the object definition with no ground or sky --- 51,54 ---- *************** *** 164,167 **** --- 157,163 ---- linkCheckBox(PDB2POVGridBean.HYBRID, hybridCheckBox); + JPanel southPanel = new JPanel(); + southPanel.setLayout(new GridBagLayout()); + distanceTextField = new DoubleTextField(0, 360); distanceTextField.setName("distance"); *************** *** 169,174 **** distanceTextField .setToolTipText("Specify the distance (Angstroms) above which bonds will not be generated for ball and stick mode."); ! centerPanel.add(distanceLabel, LayoutTools.makegbc(0, 4, 1, 0, false)); ! centerPanel.add(distanceTextField, LayoutTools.makegbc(1, 4, 1, 0, false)); linkTextField(PDB2POVGridBean.DISTANCE, distanceTextField); setValueTranslator(PDB2POVGridBean.DISTANCE, StringValueTranslator.getInstance()); --- 165,170 ---- distanceTextField .setToolTipText("Specify the distance (Angstroms) above which bonds will not be generated for ball and stick mode."); ! southPanel.add(distanceLabel, LayoutTools.makegbc(0, 4, 1, 0, false)); ! southPanel.add(distanceTextField, LayoutTools.makegbc(1, 4, 1, 0, false)); linkTextField(PDB2POVGridBean.DISTANCE, distanceTextField); setValueTranslator(PDB2POVGridBean.DISTANCE, StringValueTranslator.getInstance()); *************** *** 179,184 **** JLabel xRotationLabel = new JLabel("X-Rotation : "); xRotationTextField.setToolTipText("Specify an X-Axis rotation angle (degrees)."); ! centerPanel.add(xRotationLabel, LayoutTools.makegbc(2, 4, 1, 0, false)); ! centerPanel.add(xRotationTextField, LayoutTools.makegbc(3, 4, 1, 0, false)); linkTextField(PDB2POVGridBean.XROTATION, xRotationTextField); setValueTranslator(PDB2POVGridBean.XROTATION, StringValueTranslator.getInstance()); --- 175,180 ---- JLabel xRotationLabel = new JLabel("X-Rotation : "); xRotationTextField.setToolTipText("Specify an X-Axis rotation angle (degrees)."); ! southPanel.add(xRotationLabel, LayoutTools.makegbc(2, 4, 1, 0, false)); ! southPanel.add(xRotationTextField, LayoutTools.makegbc(3, 4, 1, 0, false)); linkTextField(PDB2POVGridBean.XROTATION, xRotationTextField); setValueTranslator(PDB2POVGridBean.XROTATION, StringValueTranslator.getInstance()); *************** *** 189,194 **** yRotationTextField.setName("YRotation"); yRotationTextField.setToolTipText("Specify an Y-Axis rotation angle (degrees)."); ! centerPanel.add(yRotationLabel, LayoutTools.makegbc(4, 4, 1, 0, false)); ! centerPanel.add(yRotationTextField, LayoutTools.makegbc(5, 4, 1, 0, false)); linkTextField(PDB2POVGridBean.YROTATION, yRotationTextField); setValueTranslator(PDB2POVGridBean.YROTATION, StringValueTranslator.getInstance()); --- 185,190 ---- yRotationTextField.setName("YRotation"); yRotationTextField.setToolTipText("Specify an Y-Axis rotation angle (degrees)."); ! southPanel.add(yRotationLabel, LayoutTools.makegbc(4, 4, 1, 0, false)); ! southPanel.add(yRotationTextField, LayoutTools.makegbc(5, 4, 1, 0, false)); linkTextField(PDB2POVGridBean.YROTATION, yRotationTextField); setValueTranslator(PDB2POVGridBean.YROTATION, StringValueTranslator.getInstance()); *************** *** 199,208 **** zRotationTextField.setName("ZRotation"); zRotationTextField.setToolTipText("Specify an Z-Axis rotation angle (degrees)."); ! centerPanel.add(zRotationLabel, LayoutTools.makegbc(6, 4, 1, 0, false)); ! centerPanel.add(zRotationTextField, LayoutTools.makegbc(7, 4, 1, 0, false)); linkTextField(PDB2POVGridBean.ZROTATION, zRotationTextField); setValueTranslator(PDB2POVGridBean.ZROTATION, StringValueTranslator.getInstance()); setValueValidator(PDB2POVGridBean.ZROTATION, NullOrDoubleValueValidator.getInstance()); ! add(new JScrollPane(centerPanel), BorderLayout.CENTER); } --- 195,209 ---- zRotationTextField.setName("ZRotation"); zRotationTextField.setToolTipText("Specify an Z-Axis rotation angle (degrees)."); ! southPanel.add(zRotationLabel, LayoutTools.makegbc(6, 4, 1, 0, false)); ! southPanel.add(zRotationTextField, LayoutTools.makegbc(7, 4, 1, 0, false)); linkTextField(PDB2POVGridBean.ZROTATION, zRotationTextField); setValueTranslator(PDB2POVGridBean.ZROTATION, StringValueTranslator.getInstance()); setValueValidator(PDB2POVGridBean.ZROTATION, NullOrDoubleValueValidator.getInstance()); ! ! JPanel panel = new JPanel(); ! panel.setLayout(new GridBagLayout()); ! panel.add(centerPanel, LayoutTools.makegbc(0, 0, 0, 0, false)); ! panel.add(southPanel, LayoutTools.makegbc(0, 1, 0, 0, false)); ! add(new JScrollPane(panel), BorderLayout.CENTER); } |
|
From: Nikolay M. <nbm...@us...> - 2007-03-16 10:50:19
|
Update of /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30200/tests/src/com/intel/gpe/tests/gui Modified Files: GUITestStarter.java Log Message: restoring testing alias Index: GUITestStarter.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui/GUITestStarter.java,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** GUITestStarter.java 16 Mar 2007 10:32:18 -0000 1.63 --- GUITestStarter.java 16 Mar 2007 10:50:17 -0000 1.64 *************** *** 304,312 **** defaults.setProperty(prefsName, gbsURL); } if (prot.equals("https")) { String id0 = testProp.getProperty("first.alias", "testing.certificate"); prefsName = testProp.getProperty("PREFS.DEFAULTIDENTITY"); String id = defaults.getProperty(prefsName); ! if (id == null || (!id.equals(id0) && abbot)) { defaults.setProperty(prefsName, id0); } --- 304,313 ---- defaults.setProperty(prefsName, gbsURL); } + boolean all = var.equals("all"); if (prot.equals("https")) { String id0 = testProp.getProperty("first.alias", "testing.certificate"); prefsName = testProp.getProperty("PREFS.DEFAULTIDENTITY"); String id = defaults.getProperty(prefsName); ! if (id == null || (!id.equals(id0) && (abbot || all))) { defaults.setProperty(prefsName, id0); } *************** *** 329,333 **** } } - boolean all = var.equals("all"); if (all || abbot) updateRegistries(abbot); --- 330,333 ---- |
|
From: Nikolay M. <nbm...@us...> - 2007-03-16 10:45:00
|
Update of /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27615/tests/src/com/intel/gpe/tests/gui Modified Files: GUITestInit.java Log Message: The new information comment (<!-- LINUX -> WINDOWS ISN'T NECESSARY -->) for tuneTests Index: GUITestInit.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui/GUITestInit.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** GUITestInit.java 14 Mar 2007 11:47:30 -0000 1.45 --- GUITestInit.java 16 Mar 2007 10:44:52 -0000 1.46 *************** *** 66,69 **** --- 66,70 ---- public static final String WINDOWS_AND_LINUX_TSS = "<!-- WINDOWS AND LINUX TSS -->"; public static final String LINUX_ISNT_NECESSARY = "<!-- WINDOWS -> LINUX ISN'T NECESSARY -->"; + public static final String WINDOWS_ISNT_NECESSARY = "<!-- LINUX -> WINDOWS ISN'T NECESSARY -->"; public static final String SECURE_TEST = "<!-- ONLY FOR SECURE -->"; public static final String NONSECURE_TEST = "<!-- ONLY FOR NONSECURE -->"; *************** *** 203,207 **** } if (!other && text.indexOf(WINDOWS_AND_LINUX_TSS) > 0) { ! if (linuxTSS || text.indexOf(LINUX_ISNT_NECESSARY) < 0) continue; } --- 204,211 ---- } if (!other && text.indexOf(WINDOWS_AND_LINUX_TSS) > 0) { ! if (!linuxTSS) { ! if (text.indexOf(LINUX_ISNT_NECESSARY) < 0) ! continue; ! } else if (text.indexOf(WINDOWS_ISNT_NECESSARY) < 0) continue; } |
|
From: Nikolay M. <nbm...@us...> - 2007-03-16 10:32:24
|
Update of /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22575/tests/src/com/intel/gpe/tests/gui Modified Files: GUITestStarter.java Log Message: add printExceptionInfo Index: GUITestStarter.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui/GUITestStarter.java,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** GUITestStarter.java 14 Mar 2007 11:49:57 -0000 1.62 --- GUITestStarter.java 16 Mar 2007 10:32:18 -0000 1.63 *************** *** 529,532 **** --- 529,533 ---- } } catch (Exception e1) { + printExceptionInfo(e1); int delim = remotePath.lastIndexOf("/"); if (delim > 0) { *************** *** 535,538 **** --- 536,540 ---- storage.listProperties(dirPath); } catch (Exception e2) { + printExceptionInfo(e2); try { storage.createDirectory(dirPath); |
|
From: Denis Z. <diz...@us...> - 2007-03-14 11:52:57
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/admin/panels/tree In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27624/clients/src/com/intel/gpe/client2/admin/panels/tree Modified Files: RegistryNode.java Log Message: fix for [ 1652283 ] To use a name registry instead of abracadabra Index: RegistryNode.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/admin/panels/tree/RegistryNode.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RegistryNode.java 19 Oct 2006 13:40:50 -0000 1.9 --- RegistryNode.java 14 Mar 2007 11:52:55 -0000 1.10 *************** *** 72,76 **** public void requestChildren() { ! executeRequest(new GetTargetSystemsWithNamesRequest(registry), this); } --- 72,76 ---- public void requestChildren() { ! executeRequest(new GetTargetSystemsWithNamesRequest(registry, name), this); } *************** *** 157,163 **** private RegistryClient registry; ! public GetTargetSystemsWithNamesRequest(RegistryClient registry) { super(MessageFormat.format(Messages ! .getString(MessagesKeys.admin_panels_tree_RegistryNode_Get_target_systems_from), registry)); this.registry = registry; } --- 157,163 ---- private RegistryClient registry; ! public GetTargetSystemsWithNamesRequest(RegistryClient registry, String registryName) { super(MessageFormat.format(Messages ! .getString(MessagesKeys.admin_panels_tree_RegistryNode_Get_target_systems_from), registryName)); this.registry = registry; } |
|
From: Nikolay M. <nbm...@us...> - 2007-03-14 11:49:59
|
Update of /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26395/tests/src/com/intel/gpe/tests/gui Modified Files: GUITestStarter.java Log Message: insert verbose to updatePreferences Index: GUITestStarter.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui/GUITestStarter.java,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** GUITestStarter.java 6 Mar 2007 07:16:53 -0000 1.61 --- GUITestStarter.java 14 Mar 2007 11:49:57 -0000 1.62 *************** *** 120,129 **** } ! public void setProperty(String key, String value) { ! if (key.charAt(0) != '/') ! key = prefsPrefix + key; ! int last = key.lastIndexOf('/'); ! Preferences node = root.node(key.substring(0, last)); ! node.put(key.substring(last + 1), value); } } --- 120,132 ---- } ! public void setProperty(String fullKey, String value) { ! if (fullKey.charAt(0) != '/') ! fullKey = prefsPrefix + fullKey; ! int last = fullKey.lastIndexOf('/'); ! Preferences node = root.node(fullKey.substring(0, last)); ! String key = fullKey.substring(last + 1); ! System.out.println("<" + fullKey + "=" + node.get(key, "undefined")); ! System.out.println(">" + fullKey + "=" + value); ! node.put(key, value); } } |
|
From: Nikolay M. <nbm...@us...> - 2007-03-14 11:47:31
|
Update of /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25561/tests/src/com/intel/gpe/tests/gui Modified Files: GUITestInit.java Log Message: new version of fix File.separator problem Index: GUITestInit.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui/GUITestInit.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** GUITestInit.java 6 Mar 2007 13:46:16 -0000 1.44 --- GUITestInit.java 14 Mar 2007 11:47:30 -0000 1.45 *************** *** 221,225 **** --- 221,258 ---- continue; } + /* + <wait component="JTextField Instance" method="getText" value="Loading GridBean C:\WORKSPACE\gpe4gtk\tests\plugins\PDB2POVGridBean.jar finished" /> + <action args="GridBeanParameterListTable Instance,"C:\WORKSPACE\gpe4gtk\tests\sources\100d.pdb"" class="javax.swing.JTable" method="actionSelectCell" /> + <assert component="JTextField Instance 3" method="getText" value="C:\WORKSPACE\gpe4gtk\tests\sources\100d.pdb" /> + <action args="FileSetTree Instance,"[File Set, C:/WORKSPACE/gpe4gtk/tests/sources/Hello.java]"" class="javax.swing.JTree" method="actionSelectRow" /> + */ if (!testName.equals(starter)) { + String[] s = text.split("\n"); + text = s[0]; + for (int j = 1; j< s.length; j++) { + String line = s[j]; + if (line.indexOf("PROJECT_") >= 0 && ( + line.indexOf("actionSelectCell") > 0 || + line.indexOf("actionSelectRow") > 0 || + line.indexOf("<assert component") >= 0 || + line.indexOf("<wait component") >= 0) + ) { + if (linuxClient && line.indexOf("PROJECT_WIN_TESTS") > 0) + line = line.replace("PROJECT_WIN_TESTS", "PROJECT_TESTS").replace('\\', '/'); + else if (!linuxClient && line.indexOf("PROJECT_TESTS") > 0) { + int k = line.indexOf("PROJECT_TESTS"); + String first = line.substring(0, k); + String middle = line.substring(k); + k = middle.indexOf('"'); + String last = middle.substring(k); + middle = middle.substring(0, k).replace('/', '\\') + .replace("PROJECT_TESTS", "PROJECT_WIN_TESTS"); + line = first + middle + last; + } + } else if (linuxClient && line.indexOf('\\') > 0) { + // line = line.replace('\\', '/'); + } + text += "\n" + line; + } text = text.replaceAll("TARGET_idb.xml", targ + "_idb.xml"). replaceAll("TARGET" + BASE_ATOMIC_NAME, targ + BASE_ATOMIC_NAME). *************** *** 238,241 **** --- 271,275 ---- replaceAll("TRUSTED_CERTIFICATE", trustedCertificate). replaceAll("HOSTNAME", hostName); + /* String[] s = text.split("\n"); text = s[0]; *************** *** 256,266 **** } else if (linuxClient && line.indexOf('\\') > 0) { line = line.replace('\\', '/'); - /*if (line.indexOf("PROJECT_WIN_TESTS") > 0) { - line = line.replaceAll("PROJECT_WIN_TESTS", "PROJECT_TESTS") - .replaceAll("\\\\", "/"); - }*/ } text += "\n" + line; } } File out = new File(outDir, testName); --- 290,297 ---- } else if (linuxClient && line.indexOf('\\') > 0) { line = line.replace('\\', '/'); } text += "\n" + line; } + */ } File out = new File(outDir, testName); |
|
From: Alexander L. <luk...@us...> - 2007-03-12 07:40:47
|
Update of /cvsroot/gpe4gtk/jmyproxy/src/com/intel/gpe/jmyproxy In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21262/src/com/intel/gpe/jmyproxy Modified Files: RequestProcessor.java Log Message: Index: RequestProcessor.java =================================================================== RCS file: /cvsroot/gpe4gtk/jmyproxy/src/com/intel/gpe/jmyproxy/RequestProcessor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RequestProcessor.java 15 Dec 2006 13:50:41 -0000 1.3 --- RequestProcessor.java 12 Mar 2007 07:40:45 -0000 1.4 *************** *** 66,69 **** --- 66,70 ---- import com.intel.gpe.security.CertificateRequest; import com.intel.gpe.security.Credential; + import com.intel.gpe.security.Extension; import com.intel.gpe.security.proxy.ProxyPolicy; import com.intel.gpe.security.proxy.ProxyUtils; *************** *** 317,326 **** X509Certificate[] certChain; try { ! certChain = ProxyUtils.signProxyCertificate( certReq.getPublicKey(), account, notBefore.getTime(), notAfter.getTime(), ! ProxyPolicy.IMPERSONATION); } catch (Exception e) { throw new WriteException(messageBundle.getMessage("cantSignCert")); --- 318,328 ---- X509Certificate[] certChain; try { ! certChain = ProxyUtils.sign( certReq.getPublicKey(), account, notBefore.getTime(), notAfter.getTime(), ! ProxyPolicy.IMPERSONATION, ! new Extension[0]); } catch (Exception e) { throw new WriteException(messageBundle.getMessage("cantSignCert")); |
|
From: Alexander L. <luk...@us...> - 2007-03-12 07:40:47
|
Update of /cvsroot/gpe4gtk/jmyproxy/lib In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21262/lib Modified Files: gpe4gtk-common.jar gpe-common.jar Log Message: Index: gpe-common.jar =================================================================== RCS file: /cvsroot/gpe4gtk/jmyproxy/lib/gpe-common.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsz778v1 and /tmp/cvscSQNzk differ Index: gpe4gtk-common.jar =================================================================== RCS file: /cvsroot/gpe4gtk/jmyproxy/lib/gpe4gtk-common.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsOn4Vr5 and /tmp/cvs0KWMIo differ |
|
From: Nikolay M. <nbm...@us...> - 2007-03-10 15:18:33
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/filemanager In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6356/clients/src/com/intel/gpe/client2/filemanager Modified Files: clientgui.properties Log Message: add/change default sizes Index: clientgui.properties =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/filemanager/clientgui.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** clientgui.properties 26 Feb 2007 10:26:17 -0000 1.3 --- clientgui.properties 10 Mar 2007 15:18:05 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- FileManagerFrame.state=0 + FileManagerFrame.SelectImportProtocolPanel.height=138 + FileManagerFrame.SelectImportProtocolPanel.width=280 + FileManagerFrame.Messages.width=500 FileManagerFrame.Messages.height=300 |
|
From: Nikolay M. <nbm...@us...> - 2007-03-10 15:18:10
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6356/clients/src/com/intel/gpe/client2/expert Modified Files: clientgui.properties Log Message: add/change default sizes Index: clientgui.properties =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/clientgui.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** clientgui.properties 7 Mar 2007 09:02:10 -0000 1.8 --- clientgui.properties 10 Mar 2007 15:18:05 -0000 1.9 *************** *** 57,61 **** ExpertClientFrame.TargetSystemChooserPanel.width=300 ! ExpertClientFrame.TargetSystemChooserPanel.height=200 ExpertClientFrame.GridBeanParameterListTable.column0=0 --- 57,61 ---- ExpertClientFrame.TargetSystemChooserPanel.width=300 ! ExpertClientFrame.TargetSystemChooserPanel.height=365 ExpertClientFrame.GridBeanParameterListTable.column0=0 |
|
From: Nikolay M. <nbm...@us...> - 2007-03-09 11:51:50
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gui/controls In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13985/clients/src/com/intel/gui/controls Modified Files: IntTextField.java DoubleTextField.java Log Message: fix for feature request [ 1677155 ] Text fields are too wide Index: DoubleTextField.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gui/controls/DoubleTextField.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DoubleTextField.java 25 Jul 2005 12:46:48 -0000 1.1 --- DoubleTextField.java 9 Mar 2007 11:51:45 -0000 1.2 *************** *** 95,99 **** super(new DoubleDocument(min, max), new Double(start).toString(), Math.max(("" + min).length(), ("" + max) ! .length())); this.min = min; --- 95,99 ---- super(new DoubleDocument(min, max), new Double(start).toString(), Math.max(("" + min).length(), ("" + max) ! .length()) * 2 / 3); this.min = min; *************** *** 115,119 **** public DoubleTextField(String text, double min, double max) { ! super(new DoubleDocument(min, max), text, Math.max(("" + min).length(), ("" + max).length())); this.min = min; --- 115,119 ---- public DoubleTextField(String text, double min, double max) { ! super(new DoubleDocument(min, max), text, Math.max(("" + min).length(), ("" + max).length()) * 2 / 3); this.min = min; *************** *** 143,147 **** // convert min and max to String by adding "" ! setColumns(Math.max(("" + min).length(), ("" + max).length())); ((DoubleDocument) getDocument()).setMaximum(max); } --- 143,147 ---- // convert min and max to String by adding "" ! setColumns(Math.max(("" + min).length(), ("" + max).length()) * 2 / 3); ((DoubleDocument) getDocument()).setMaximum(max); } *************** *** 157,161 **** // convert min and max to String by adding "" ! setColumns(Math.max(("" + min).length(), ("" + max).length())); ((DoubleDocument) getDocument()).setMinimum(min); } --- 157,161 ---- // convert min and max to String by adding "" ! setColumns(Math.max(("" + min).length(), ("" + max).length()) * 2 / 3); ((DoubleDocument) getDocument()).setMinimum(min); } Index: IntTextField.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gui/controls/IntTextField.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IntTextField.java 25 Jul 2005 12:46:48 -0000 1.1 --- IntTextField.java 9 Mar 2007 11:51:45 -0000 1.2 *************** *** 114,118 **** super(new IntDocument(min, max), new Integer(start).toString(), Math.max(("" + min).length(), ("" + max) ! .length())); this.min = min; --- 114,118 ---- super(new IntDocument(min, max), new Integer(start).toString(), Math.max(("" + min).length(), ("" + max) ! .length()) * 3 / 4); this.min = min; *************** *** 135,139 **** public IntTextField(String text, int min, int max) { ! super(new IntDocument(min, max), text, Math.max(("" + min).length(), ("" + max).length())); this.min = min; --- 135,139 ---- public IntTextField(String text, int min, int max) { ! super(new IntDocument(min, max), text, Math.max(("" + min).length(), ("" + max).length()) * 3 / 4); this.min = min; *************** *** 165,169 **** // convert min and max to String by adding "" ! setColumns(Math.max(("" + min).length(), ("" + max).length())); ((IntDocument) getDocument()).setMaximum(max); } --- 165,169 ---- // convert min and max to String by adding "" ! setColumns(Math.max(("" + min).length(), ("" + max).length()) * 3 / 4); ((IntDocument) getDocument()).setMaximum(max); } *************** *** 179,183 **** // convert min and max to String by adding "" ! setColumns(Math.max(("" + min).length(), ("" + max).length())); ((IntDocument) getDocument()).setMinimum(min); } --- 179,183 ---- // convert min and max to String by adding "" ! setColumns(Math.max(("" + min).length(), ("" + max).length()) * 3 / 4); ((IntDocument) getDocument()).setMinimum(min); } |
|
From: Nikolay M. <nbm...@us...> - 2007-03-09 11:04:02
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gui/controls In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27337/clients/src/com/intel/gui/controls Modified Files: DoubleDocument.java Log Message: fix for bug [ 1677119 ] It's possible to enter number > maximum into DoubleTextField Index: DoubleDocument.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gui/controls/DoubleDocument.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DoubleDocument.java 25 Jul 2005 12:46:48 -0000 1.1 --- DoubleDocument.java 9 Mar 2007 11:03:58 -0000 1.2 *************** *** 82,85 **** --- 82,87 ---- try { double i = Double.parseDouble(tmp); + if (i > max) + valid = false; } catch (NumberFormatException e) { |
|
From: Nikolay M. <nbm...@us...> - 2007-03-09 10:03:30
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/actions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3631/clients/src/com/intel/gpe/client2/expert/workfloweditor/actions Modified Files: SubmitWorkflowAction.java Log Message: fix for bug [ 1677091 ] The life of Job is impossible more than 24 days Index: SubmitWorkflowAction.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/expert/workfloweditor/actions/SubmitWorkflowAction.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** SubmitWorkflowAction.java 15 Feb 2007 14:01:53 -0000 1.17 --- SubmitWorkflowAction.java 9 Mar 2007 10:03:27 -0000 1.18 *************** *** 154,158 **** return; } ! terminationTime.add(Calendar.MILLISECOND, (int) time); } else { --- 154,158 ---- return; } ! terminationTime.add(Calendar.SECOND, (int)(time/1000)); } else { |
|
From: Nikolay M. <nbm...@us...> - 2007-03-09 10:03:30
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/common/actions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3631/clients/src/com/intel/gpe/client2/common/actions Modified Files: SubmitAction.java Log Message: fix for bug [ 1677091 ] The life of Job is impossible more than 24 days Index: SubmitAction.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/common/actions/SubmitAction.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** SubmitAction.java 15 Feb 2007 14:01:39 -0000 1.31 --- SubmitAction.java 9 Mar 2007 10:03:27 -0000 1.32 *************** *** 197,201 **** return; } ! terminationTime.add(Calendar.MILLISECOND, (int) time); } else { --- 197,201 ---- return; } ! terminationTime.add(Calendar.SECOND, (int)(time/1000)); } else { |
