Shortcut key
State of ShortCut key
@@ -198,10 +199,10 @@ Examples:
ShortCut1 = ["F1", "None",
"SmartTool","Assign_Value"]
# F1
-ShortCut2 = ["KP_Subtract", "None",
+ShortCut2 = ["NUMPAD_SUBTRACT", "None",
"SmartTool","AdjustValue_Down"]
# Keypad -
-ShortCut3 = ["KP_Add", "None",
+ShortCut3 = ["NUMPAD_ADD", "None",
"SmartTool","AdjustValue_Up"]
# Keypad +
ShortCut4 = ["F2", "None", "SmartTool","Smooth"]
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/VCParm.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/VCParm.java
index d9f70456a5..74dae96982 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/VCParm.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/VCParm.java
@@ -25,6 +25,9 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+
import com.raytheon.uf.common.dataplugin.gfe.GridDataHistory;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.slice.DiscreteGridSlice;
@@ -37,6 +40,7 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.common.util.RWLArrayList;
+import com.raytheon.viz.gfe.Activator;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.griddata.AbstractGridData;
import com.raytheon.viz.gfe.core.griddata.IGridData;
@@ -107,8 +111,13 @@ public class VCParm extends VParm implements IParmListChangedListener,
// Need to check that the above call to mod.getGpi() did not fail
if (!mod.isValid()) {
- statusHandler.handle(Priority.EVENTB, "Can't get GPI: ",
- this.mod.getErrorString());
+ //statusHandler.handle(Priority.EVENTB, "Can't get GPI: ",
+ // this.mod.getErrorString());
+ Activator
+ .getDefault()
+ .getLog()
+ .log(new Status(IStatus.INFO, Activator.PLUGIN_ID,
+ "Can't get GPI: " + this.mod.getErrorString()));
}
// set the parm type
@@ -455,9 +464,14 @@ public class VCParm extends VParm implements IParmListChangedListener,
// get list of dependent parms
List args = new ArrayList(mod.dependentParms());
if (!mod.isValid()) {
- statusHandler.handle(Priority.EVENTB,
- "Error getting dependent WeatherElements: ",
- mod.getErrorString());
+ //statusHandler.handle(Priority.EVENTB,
+ // "Error getting dependent WeatherElements: ",
+ // mod.getErrorString());
+ Activator
+ .getDefault()
+ .getLog()
+ .log(new Status(IStatus.INFO, Activator.PLUGIN_ID,
+ "Error getting dependent WeatherElements: " + this.mod.getErrorString()));
}
// get list of currently registered parms
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WEBrowserTypeRecord.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WEBrowserTypeRecord.java
index 321d0f4bca..2e5cfe46b0 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WEBrowserTypeRecord.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WEBrowserTypeRecord.java
@@ -21,7 +21,6 @@ package com.raytheon.viz.gfe.dialogs;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
@@ -32,8 +31,6 @@ import java.util.TimeZone;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.viz.core.mode.CAVEMode;
-import com.raytheon.viz.gfe.GFEServerException;
-import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.IParmManager;
/**
@@ -48,6 +45,10 @@ import com.raytheon.viz.gfe.core.IParmManager;
* 04/30/2009 2282 rjpeter Refactored interfaces.
* 08/19/2009 2547 rjpeter Implement Test/Prac database display.
* 02/22/2012 14351 mli update with incoming databases
+ * 09/12/2012 #1117 dgilling Revert previous changes, force
+ * source list to always rebuild to ensure
+ * up to date db list.
+ *
*
*
* @author ebabin
@@ -58,7 +59,7 @@ public class WEBrowserTypeRecord {
private String type;
- private java.util.List sources = new ArrayList();
+ private List sources = new ArrayList();
public static final SimpleDateFormat SOURCE_FORMAT = new SimpleDateFormat(
"dd/HHmm");
@@ -77,12 +78,14 @@ public class WEBrowserTypeRecord {
*/
private Map>> miscMap = new HashMap>>();
- private ParmID possibleParms[];
+ private ParmID[] possibleParms;
- private ParmID fields[];
+ private ParmID[] fields;
private final CAVEMode mode;
+ private final IParmManager parmMgr;
+
static {
SOURCE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT"));
}
@@ -90,9 +93,10 @@ public class WEBrowserTypeRecord {
/**
* @return the type
*/
- public WEBrowserTypeRecord(String type, CAVEMode mode) {
+ public WEBrowserTypeRecord(String type, CAVEMode mode, IParmManager parmMgr) {
this.type = type;
this.mode = mode;
+ this.parmMgr = parmMgr;
// create and fill these entries on creation of this type.
makeSources();
// go ahead and fill the ParmID[] array.
@@ -115,14 +119,7 @@ public class WEBrowserTypeRecord {
* @return the sources
*/
public java.util.List getSources() {
- return sources;
- }
-
- /**
- * @return the sources
- */
- public java.util.List getUpdatedSources() {
- makeSources();
+ makeSources();
return sources;
}
@@ -136,7 +133,7 @@ public class WEBrowserTypeRecord {
return fields;
}
- private ArrayList getDbsForType(String typeLabel) {
+ private List getDbsForType(String typeLabel) {
boolean pracFlag = false;
boolean testFlag = false;
@@ -145,19 +142,9 @@ public class WEBrowserTypeRecord {
pracFlag = mode.equals(CAVEMode.PRACTICE);
testFlag = mode.equals(CAVEMode.TEST);
}
-// List dbs = DataManager.getCurrentInstance()
-// .getParmManager().getAvailableDbs();
+ List dbs = parmMgr.getAvailableDbs();
- // Always retrieve updated databases
- List dbs = null;
- try {
- dbs = DataManager.getCurrentInstance().getClient().getAvailableDbs();
- } catch (GFEServerException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- ArrayList filtDB = new ArrayList();
+ List filtDB = new ArrayList();
for (DatabaseID db : dbs) {
if (db.getDbType().equalsIgnoreCase(typeLabel)) {
@@ -167,88 +154,89 @@ public class WEBrowserTypeRecord {
} else if (db.getDbType().equalsIgnoreCase("Test") && testFlag) {
filtDB.add(db);
}
-
}
return filtDB;
}
private void makeSources() {
- ArrayList databases = getDbsForType(type);
- IParmManager parmMgr = DataManager.getCurrentInstance()
- .getParmManager();
+ // clear all existing data as we will end up rebuilding it here...
+ sources.clear();
+ fieldMap.clear();
+ miscMap.clear();
+ pressureMap.clear();
- // move mutable to front of list.
- DatabaseID mutableDb = parmMgr.getMutableDatabase();
- if (databases.indexOf(mutableDb) > 0) {
- databases.remove(mutableDb);
- databases.add(0, mutableDb);
- }
+ List databases = getDbsForType(type);
+ final DatabaseID mutableDb = parmMgr.getMutableDatabase();
Collections.sort(databases, new Comparator() {
@Override
public int compare(DatabaseID left, DatabaseID right) {
- String compare1 = null == left.getModelName() ? "" : left
- .getModelName();
- String compare2 = null == right.getModelName() ? "" : right
- .getModelName();
-
- int returnValue = compare1.compareTo(compare2);
- if (0 == returnValue) {
- compare1 = null == left.getModelTime() ? "" : left
- .getModelTime();
- compare2 = null == right.getModelTime() ? "" : right
- .getModelTime();
- returnValue = -1 * compare1.compareTo(compare2);
+ // sorting rules for WeatherElementBrowser:
+ // mutable first
+ // singletons next in alpha order
+ // rest in order first by name, then time (newest to oldest)
+ if (left.equals(right)) {
+ return 0;
}
- return returnValue;
+
+ if (left.equals(mutableDb)) {
+ return -1;
+ } else if (right.equals(mutableDb)) {
+ return 1;
+ }
+
+ String leftModelTime = (left.getModelTime() != null ? left
+ .getModelTime() : "");
+ String rightModelTime = (right.getModelTime() != null ? right
+ .getModelTime() : "");
+ if (leftModelTime.equals(DatabaseID.NO_MODEL_TIME)
+ && (!rightModelTime.equals(DatabaseID.NO_MODEL_TIME))) {
+ return -1;
+ } else if (!leftModelTime.equals(DatabaseID.NO_MODEL_TIME)
+ && (rightModelTime.equals(DatabaseID.NO_MODEL_TIME))) {
+ return 1;
+ } else if (leftModelTime.equals(DatabaseID.NO_MODEL_TIME)
+ && (rightModelTime.equals(DatabaseID.NO_MODEL_TIME))) {
+ return left.getModelName().compareTo(right.getModelName());
+ }
+
+ int modelNameCompare = left.getModelName().compareTo(
+ right.getModelName());
+ if (modelNameCompare != 0) {
+ return modelNameCompare;
+ }
+ return -1 * leftModelTime.compareTo(rightModelTime);
}
});
- for (DatabaseID dbase : databases) {
- String sourceTime = dbase.getModelName();
- if (dbase.getModelDate() != null) {
+ for (DatabaseID dbId : databases) {
+ String sourceString = dbId.getModelName();
+ if (dbId.getModelDate() != null) {
synchronized (SOURCE_FORMAT) {
- sourceTime += " "
- + SOURCE_FORMAT.format(dbase.getModelDate());
+ sourceString += " "
+ + SOURCE_FORMAT.format(dbId.getModelDate());
}
}
- boolean srcAdded = false;
- ParmID[] availParms = parmMgr.getAvailableParms(dbase);
- if (availParms != null) {
- for (ParmID parm : availParms) {
- if (parm.getParmLevel().startsWith("MB")) {
- addToMap(pressureMap, sourceTime, parm.getParmName(),
- parm.getParmLevel());
- } else {
- addToMap(miscMap, sourceTime, parm.getParmName(),
- parm.getParmLevel());
- }
- DatabaseID parmDB = parm.getDbId();
- if (parmDB.getModelName().equalsIgnoreCase(
- dbase.getModelName())
- && parmDB.getModelTime().equalsIgnoreCase(
- dbase.getModelTime())
- && parmDB.getDbType().equalsIgnoreCase(
- dbase.getDbType())) {
- if (!sources.contains(sourceTime)) {
- sources.add(sourceTime);
- srcAdded = true;
- }
- }
- }
- if (srcAdded) {
- // create a list...
- ArrayList ids = new ArrayList();
- for (ParmID parm : availParms) {
- ids.add(parm);
- }
- java.util.Collections.sort(ids);
+ sources.add(sourceString);
- fieldMap.put(sourceTime,
- ids.toArray(new ParmID[ids.size()]));
+ ParmID[] availParms = parmMgr.getAvailableParms(dbId);
+ List sortedParms = new ArrayList(availParms.length);
+ for (ParmID parm : availParms) {
+ if (parm.getParmLevel().startsWith("MB")) {
+ addToMap(pressureMap, sourceString, parm.getParmName(),
+ parm.getParmLevel());
+ } else {
+ addToMap(miscMap, sourceString, parm.getParmName(),
+ parm.getParmLevel());
}
+
+ sortedParms.add(parm);
}
+
+ Collections.sort(sortedParms);
+ fieldMap.put(sourceString,
+ sortedParms.toArray(new ParmID[sortedParms.size()]));
}
}
@@ -420,11 +408,10 @@ public class WEBrowserTypeRecord {
*/
public ParmID[] getPossibleParmIDs() {
if (possibleParms == null) {
- ArrayList databases = getDbsForType(type);
+ List databases = getDbsForType(type);
ArrayList parmIds = new ArrayList();
for (DatabaseID db : databases) {
- ParmID ids[] = DataManager.getCurrentInstance()
- .getParmManager().getAvailableParms(db);
+ ParmID ids[] = parmMgr.getAvailableParms(db);
for (int i = 0; i < ids.length; i++) {
parmIds.add(ids[i]);
}
@@ -437,25 +424,6 @@ public class WEBrowserTypeRecord {
return possibleParms;
}
- /**
- * Add ParmIDs for new database
- */
- public void addNewParmIDs(String newSource) {
- ArrayList parmIds = new ArrayList();
- possibleParms = getPossibleParmIDs();
- parmIds.addAll(Arrays.asList(possibleParms));
-
- ParmID ids[] = getFields(newSource);
- for ( int i = 0; i < ids.length; i++) {
- if (!parmIds.contains(ids[i])) {
- parmIds.add(ids[i]);
- }
- }
-
- possibleParms = new ParmID[parmIds.size()];
- parmIds.toArray(possibleParms);
- }
-
public ArrayList getFilteredParmIDs(String sources[],
String fields[], String planes[]) {
ArrayList listToReturn = new ArrayList();
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementBrowserDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementBrowserDialog.java
index 8de9c1c32d..ecf249623b 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementBrowserDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementBrowserDialog.java
@@ -51,7 +51,6 @@ import org.eclipse.swt.widgets.ToolItem;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.viz.core.mode.CAVEMode;
-import com.raytheon.viz.gfe.GFEServerException;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.parm.Parm;
import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
@@ -69,7 +68,10 @@ import com.raytheon.viz.ui.widgets.ToggleSelectList;
* 06/27/2008 ebabin Updated to properly add fields.
* 04/30/2009 2282 rjpeter Refactored.
* 08/19/2009 2547 rjpeter Fix Test/Prac database display.
- * 02/22/2012 14351 mli update with incoming new grids.
+ * 02/22/2012 14351 mli update with incoming new grids.
+ * 09/12/2012 #1117 dgilling Revert previous changes, retrieve
+ * database list from ParmManager
+ * not EDEX.
*
*
* @author ebabin
@@ -107,8 +109,6 @@ public class WeatherElementBrowserDialog extends CaveJFACEDialog {
private ParmID[] currentDisplayedParms;
- private List databases;
-
private static final Point size = new Point(603, 778);
private static final String IFP = "IFP";
@@ -499,7 +499,6 @@ public class WeatherElementBrowserDialog extends CaveJFACEDialog {
* Automatically checks for dups, and sorts.
*/
private void updateSourceMenu() {
- sourceList.removeAll();
resetMenu(sourceMenu);
List sortedSources = selectedType.getSources();
@@ -519,48 +518,6 @@ public class WeatherElementBrowserDialog extends CaveJFACEDialog {
}
}
- /*
- * check for incoming new databases
- */
- private void checkForNewSource() {
- List sortedSources = selectedType.getUpdatedSources();
-
- if (sortedSources != null) {
- List newSources = new ArrayList();
-
- // Check for new new database
- for (String source : sortedSources) {
- boolean found = false;
- for (int i = 0; i < sourceMenu.getItemCount(); i++) {
- if (sourceMenu.getItem(i).getText().equals(source)) {
- found = true;
- break;
- }
- }
-
- if (!found) {
- newSources.add(source);
- }
- }
-
- // create menuItem for new database
- if (newSources != null) {
- for (String s : newSources) {
- selectedType.addNewParmIDs(s);
- final MenuItem item = new MenuItem(sourceMenu, SWT.PUSH);
- item.setText(s);
- item.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- addToList(item.getText(), sourceList);
- processSourceSelection();
- }
- });
- }
- }
- }
- }
-
private void processSourceSelection() {
java.util.List currentSourceSelection = java.util.Arrays
.asList(sourceList.getSelection());
@@ -858,9 +815,7 @@ public class WeatherElementBrowserDialog extends CaveJFACEDialog {
sourceToolItem.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
- // Check for new source
- checkForNewSource();
-
+ updateSourceMenu();
Rectangle rect = sourceToolItem.getBounds();
Point pt = new Point(rect.x, rect.y + rect.height);
pt = sourceToolBar.toDisplay(pt);
@@ -1208,10 +1163,11 @@ public class WeatherElementBrowserDialog extends CaveJFACEDialog {
final CAVEMode mode = CAVEMode.getMode();
if (mutableID.getDbType().equalsIgnoreCase("")) {
- typeEntries.add(new WEBrowserTypeRecord(IFP, mode));
+ typeEntries.add(new WEBrowserTypeRecord(IFP, mode, dataManager
+ .getParmManager()));
} else {
- typeEntries
- .add(new WEBrowserTypeRecord(mutableID.getDbType(), mode));
+ typeEntries.add(new WEBrowserTypeRecord(mutableID.getDbType(),
+ mode, dataManager.getParmManager()));
}
for (DatabaseID database : getDatabases()) {
@@ -1229,7 +1185,8 @@ public class WeatherElementBrowserDialog extends CaveJFACEDialog {
databaseType = IFP;
}
- typeEntries.add(new WEBrowserTypeRecord(databaseType, mode));
+ typeEntries.add(new WEBrowserTypeRecord(databaseType, mode,
+ dataManager.getParmManager()));
}
if (!siteList.contains(database.getSiteId())) {
siteList.add(database.getSiteId());
@@ -1251,19 +1208,7 @@ public class WeatherElementBrowserDialog extends CaveJFACEDialog {
}
private List getDatabases() {
- if (databases == null) {
-// databases = dataManager.getParmManager().getAvailableDbs();
-
- // Always Retrieve updated databases
- try {
- databases = DataManager.getCurrentInstance().getClient().getAvailableDbs();
- } catch (GFEServerException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- return databases;
+ return dataManager.getParmManager().getAvailableDbs();
}
private ParmID[] getSelectedParmIDS() {
@@ -1294,6 +1239,7 @@ public class WeatherElementBrowserDialog extends CaveJFACEDialog {
*
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
+ @Override
public int compare(String s1, String s2) {
// we expect pressure strings to read MBnnnn (e.g., MB100 or
// MB1000), thus we'll strip the first two letters of the strings
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java
index 6ba210d317..45e098eef9 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java
@@ -56,7 +56,8 @@ import com.raytheon.viz.gfe.textformatter.TextProductManager;
* 2 SEP 2011 10654 gzhou Delete running/pending task and close tab.
* 23 MAY 2012 14859 ryu Select VTEC formatting in practice mode
* based on VTECMessageType setting.
- * 10 AUG 2012 15178 mli Add autoWrite and autoStore capability
+ * 10 AUG 2012 15178 mli Add autoWrite and autoStore capability
+ * 26 SEP 2012 15423 ryu Fix product correction in practice mode
*
*
*
@@ -432,8 +433,11 @@ public class ProductAreaComp extends Composite implements
int pracType = 0;
if (practiceMode) {
- String pil = (String) textProductMgr.getProductDefinition(productName)
- .get("pil");
+ String pil = null;
+ if (textProductMgr.getProductDefinition(productName) != null) {
+ pil = (String) textProductMgr.getProductDefinition(productName)
+ .get("pil");
+ }
if (pil != null) {
String vtecMode = textProductMgr.getVtecMessageType(
pil.substring(0, 3));
@@ -643,7 +647,7 @@ public class ProductAreaComp extends Composite implements
if (productText != null) {
productEditorComp.retrieveActiveVTEC();
productEditorComp.setProductText(productText);
-
+
// handle autoWrite and autoStore...
productEditorComp.doAutoStuff();
}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
index 3faab1f87f..ee6beeec5f 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
@@ -1,19 +1,19 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
+ *
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
- *
+ *
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
- *
+ *
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
@@ -67,7 +67,7 @@ import com.raytheon.viz.gfe.textformatter.TextFmtParserUtil;
/**
* Composite containing the product editor.
- *
+ *
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
@@ -75,12 +75,13 @@ import com.raytheon.viz.gfe.textformatter.TextFmtParserUtil;
* 05 Jan 2008 1784 lvenable Initial creation
* 19 Feb 2010 4132 ryu Product correction.
* 30 Jul 2010 6719 jnjanga Placed cursor at the end of inserted CTA
- *
+ * 26 Sep 2012 15423 ryu Avoid resetting text when possible.
+ *
*
- *
+ *
* @author lvenable
* @version 1.0
- *
+ *
*/
public class StyledTextComp extends Composite {
private static final transient IUFStatusHandler statusHandler = UFStatus
@@ -179,7 +180,7 @@ public class StyledTextComp extends Composite {
/**
* Constructor.
- *
+ *
* @param parent
* Parent composite.
*/
@@ -297,7 +298,7 @@ public class StyledTextComp extends Composite {
/**
* Get the StyledText editor.
- *
+ *
* @return The StyledText editor.
*/
public StyledText getTextEditorST() {
@@ -306,7 +307,7 @@ public class StyledTextComp extends Composite {
/**
* Set the product text.
- *
+ *
* @param text
* The product text.
*/
@@ -324,7 +325,7 @@ public class StyledTextComp extends Composite {
/**
* computes the logical caret offset within the ProductEditor as a result of
* the CTA insert.
- *
+ *
* @param newProductText
* The new product text
*/
@@ -483,7 +484,7 @@ public class StyledTextComp extends Composite {
/**
* Parse the product text string.
- *
+ *
* @param productText
*/
private void parseProductText(String productText) {
@@ -669,7 +670,7 @@ public class StyledTextComp extends Composite {
/**
* Handle the verify key event. This event fires after a change has been
* made to the control (after the text has been updated, for example)
- *
+ *
* @param event
* Verify event that was fired.
*/
@@ -765,7 +766,7 @@ public class StyledTextComp extends Composite {
/**
* Handle the key event when a key is released.
- *
+ *
* @param ke
* Key event.
*/
@@ -787,7 +788,7 @@ public class StyledTextComp extends Composite {
/**
* Check if there is selected text and if there is locked text in the
* selected text.
- *
+ *
* @return True if there is selected text that contains locked text.
*/
private boolean selectionHasLockedText() {
@@ -801,12 +802,12 @@ public class StyledTextComp extends Composite {
/**
* Check if there is locked text in the specified range of text.
- *
+ *
* @param offset
* The starting point of the locked text search.
* @param length
* The length of the search.
- *
+ *
* @return Whether or not there is text in the range that contains locked
* text.
*/
@@ -824,7 +825,7 @@ public class StyledTextComp extends Composite {
/**
* Select the framing code and the text contained in the framing code.
- *
+ *
* @param sr
* StyleRange.
*/
@@ -836,7 +837,7 @@ public class StyledTextComp extends Composite {
/**
* Check if the key being pressed is a "non-edit" key.
- *
+ *
* @param event
* Verify event.
* @return True if the key is an arrow or "non-edit" key.
@@ -870,7 +871,7 @@ public class StyledTextComp extends Composite {
/**
* Handle the mouse down event.
- *
+ *
* @param e
* Event fired.
*/
@@ -905,7 +906,7 @@ public class StyledTextComp extends Composite {
/**
* Handle the mouse up event
- *
+ *
* @param e
* Event fired.
*/
@@ -1012,7 +1013,7 @@ public class StyledTextComp extends Composite {
/**
* Checks if the system is editing, e.g. updating the issue time every
* minute, vs a user typing text in the text area
- *
+ *
* @return
*/
private boolean isSystemTextChange() {
@@ -1036,7 +1037,18 @@ public class StyledTextComp extends Composite {
dirty = false;
}
+ protected boolean isUpperCase(final String word) {
+ for (int index= word.length() - 1; index >= 0; index--) {
+ if (Character.isLowerCase(word.charAt(index)))
+ return false;
+ }
+ return true;
+ }
+
protected void upper() {
+ String text = textEditorST.getText();
+ if (isUpperCase(text))
+ return;
int topIdx = textEditorST.getTopIndex();
setProductText(textEditorST.getText().toUpperCase());
textEditorST.setTopIndex(topIdx);
@@ -1152,7 +1164,7 @@ public class StyledTextComp extends Composite {
/**
* Getter for the column at which wrap and auto-wrap will wrap the text.
- *
+ *
* @return the column number
*/
public int getWrapColumn() {
@@ -1161,7 +1173,7 @@ public class StyledTextComp extends Composite {
/**
* Getter for the column at which wrap and auto-wrap will wrap the text.
- *
+ *
* @param wrapColumn
* the column number
*/
@@ -1200,7 +1212,7 @@ public class StyledTextComp extends Composite {
/**
* Query the prefs for setting. If it does not exist, use colorDft as its
* value. Create an SWT Color for display from the value and return it.
- *
+ *
* @param prefs
* A preference store which might have config values.
* @param display
@@ -1223,7 +1235,7 @@ public class StyledTextComp extends Composite {
/**
* Send a PROBLEM message if color1 is exactly equal to color2.
- *
+ *
* @param color1
* the first color
* @param color2
@@ -1250,7 +1262,7 @@ public class StyledTextComp extends Composite {
*
* The getter name is different to avoid confusion with the getFgColor()
* method of Control.
- *
+ *
* @return the foreground Color
*/
public Color getFgndColor() {
@@ -1261,7 +1273,7 @@ public class StyledTextComp extends Composite {
* Get the framed text color of the StyledTextComp. This is the actual
* color, not a copy. It will be disposed when the StyledTextComp is, and
* should not be disposed before then.
- *
+ *
* @return the frameColor
*/
public Color getFrameColor() {
@@ -1272,7 +1284,7 @@ public class StyledTextComp extends Composite {
* Get the insert color of the StyledTextComp. This is the actual color, not
* a copy. It will be disposed when the StyledTextComp is, and should not be
* disposed before then.
- *
+ *
* @return the insertColor
*/
public Color getInsertColor() {
@@ -1283,7 +1295,7 @@ public class StyledTextComp extends Composite {
* Get the locked text color of the StyledTextComp. This is the actual
* color, not a copy. It will be disposed when the StyledTextComp is, and
* should not be disposed before then.
- *
+ *
* @return the lockColor
*/
public Color getLockColor() {
@@ -1293,7 +1305,7 @@ public class StyledTextComp extends Composite {
/**
* Word wrap the text in the block around cursorIndex. Adjust the cursor
* position to account for inserted or deleted whitespace.
- *
+ *
* @param st
* The StyledText in which word wrap is to be performed
* @param cursorIndex
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
index 1a1bb92776..34cbf3c6e8 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
@@ -1198,7 +1198,7 @@ public class ServiceBackupDlg extends CaveJFACEDialog {
+ UserController.getUserObject().uniqueId());
}
- if (!runningAsPrimary) {
+ if ((!runningAsPrimary) && (!LocalizationManager.getInstance().isNationalCenter())) {
doExCon.setEnabled(false);
}
}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
index f5eaa40869..650fd16c55 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
@@ -29,6 +29,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.TimeZone;
@@ -226,6 +227,8 @@ public class MakeHazardDialog extends CaveSWTDialog implements
private boolean running;
+ private org.eclipse.swt.widgets.List hazardGroupList;
+
public MakeHazardDialog(Shell parent, DataManager dataManager,
String colorName, int defaultMapWidth, int timeScaleEndTime,
float areaThreshold, String defaultHazardType,
@@ -235,7 +238,8 @@ public class MakeHazardDialog extends CaveSWTDialog implements
Map> localEffectAreas,
Map> localAreaData) {
- super(parent, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.DO_NOT_BLOCK);
+ super(parent, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.DO_NOT_BLOCK
+ | CAVE.NO_PACK);
this.dataManager = dataManager;
this.defaultMapWidth = defaultMapWidth;
this.timeScaleEndTime = timeScaleEndTime;
@@ -279,6 +283,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
protected void initializeComponents(Shell shell) {
// Initialize all of the controls and layouts
initializeComponents();
+ shell.pack();
this.comboDict = new HashMap();
setHazardType(this.defaultHazardType);
@@ -1012,9 +1017,8 @@ public class MakeHazardDialog extends CaveSWTDialog implements
}
};
- org.eclipse.swt.widgets.List hazardGroupList = new org.eclipse.swt.widgets.List(
- hazardTypeGroup, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL
- | SWT.SINGLE);
+ hazardGroupList = new org.eclipse.swt.widgets.List(hazardTypeGroup,
+ SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE);
gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
gd.heightHint = hazardGroupList.getItemHeight() * 12
+ hazardGroupList.getBorderWidth();
@@ -1100,6 +1104,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
// create the start time slider
startTimeSlider = new Scale(startGroup, SWT.HORIZONTAL);
gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
+ gd.minimumWidth = 200;
startTimeSlider.setLayoutData(gd);
startTimeSlider.addSelectionListener(new SelectionListener() {
@@ -1130,7 +1135,6 @@ public class MakeHazardDialog extends CaveSWTDialog implements
startTimeSlider.setMaximum(this.timeScaleEndTime);
startTimeSlider.setIncrement(1);
startTimeSlider.setPageIncrement(1);
- startTimeSlider.setLayoutData(new GridData(200, SWT.DEFAULT));
// Force start time to an hourly boundary
Calendar cal = Calendar.getInstance();
@@ -1158,6 +1162,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
// Create the end time slider
endTimeSlider = new Scale(endGroup, SWT.HORIZONTAL);
gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
+ gd.minimumWidth = 200;
endTimeSlider.setLayoutData(gd);
endTimeSlider.setMinimum(1);
@@ -1165,7 +1170,6 @@ public class MakeHazardDialog extends CaveSWTDialog implements
endTimeSlider.setIncrement(1);
endTimeSlider.setPageIncrement(1);
endTimeSlider.setSelection(1);
- endTimeSlider.setLayoutData(new GridData(200, SWT.DEFAULT));
endTimeSlider.addSelectionListener(new SelectionListener() {
@Override
@@ -1215,6 +1219,21 @@ public class MakeHazardDialog extends CaveSWTDialog implements
gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
leCombo.setLayoutData(gd);
leCombo.addSelectionListener(selAdapt);
+
+ GC gc = new GC(this.getDisplay());
+ String longest = "";
+ int widest = 0;
+ for (List list : localEffectAreas.values()) {
+ for (String s : list) {
+ int width = gc.stringExtent(s).x;
+ if (width > widest) {
+ widest = width;
+ longest = s;
+ }
+ }
+ }
+ gc.dispose();
+ leCombo.add(longest);
}
private Map> getHazardsDictionary() {
@@ -1317,6 +1336,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
* the hazard type to select.
*/
public void setHazardType(String hazardType) {
+ hazardGroupList.setSelection(hazardGroupList.indexOf(hazardType));
updateSelectedHazardList(hazardType);
if (this.localEffectAreas.containsKey(hazardType)) {
@@ -1345,9 +1365,15 @@ public class MakeHazardDialog extends CaveSWTDialog implements
leGroup.setVisible(false);
((GridData) leGroup.getLayoutData()).exclude = true;
this.hazLocalEffect = "None";
- this.etnSegNumberField.setText("");
+ String s = etnSegNumberField.getText();
+ for (Entry> entry : localAreaData.entrySet()) {
+ if (s.equals(entry.getValue().get(0))) {
+ this.etnSegNumberField.setText("");
+ this.etnSegNumberField.setSelection(0);
+ break;
+ }
+ }
}
- leGroup.getParent().pack();
}
/**
@@ -1375,9 +1401,9 @@ public class MakeHazardDialog extends CaveSWTDialog implements
}
}
- private void hazardLocalEffectSelected(String s) {
- this.hazLocalEffect = s;
- List