xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge tag 'OB_16.1.1-6' into omaha_16.1.1

Browse source 
16.1.1-6


Former-commit-id: 002910fe88718d1801018450799a658b42a6a696
This commit is contained in:
Steve Harris 2015-08-19 13:40:43 -05:00
commit d6ab160019
5 changed files with 111 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
View file

@ -169,6 +169,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Expunged Calendar from ActiveTableRecord
* 07/02/2015 13753 lshi Update times for products in Product Editor
* 07/22/2015 13753 lshi Keeps issue time unchanged
* 08/06/2015 13753 lshi removed updateTime flag, undo the change of updateIssueExpireTimes, etc.
* </pre>
*
* @author lvenable
@ -185,7 +186,7 @@ public class ProductEditorComp extends Composite implements
/**
* Parent composite.
*/
private Composite parent;
private final Composite parent;
/**
* Toolbar used to mimic a menu bar.
@ -289,7 +290,7 @@ public class ProductEditorComp extends Composite implements
/**
* Date & time formatter.
*/
private SimpleDateFormat expireLabelFmt = new SimpleDateFormat(
private final SimpleDateFormat expireLabelFmt = new SimpleDateFormat(
"HH:mm'Z' dd-MMM-yy");
/**
@ -311,9 +312,9 @@ public class ProductEditorComp extends Composite implements
private ProductDefinition productDefinition;
private String productName;
private final String productName;
private boolean editorCorrectionMode;
private final boolean editorCorrectionMode;
private boolean testVTEC;
@ -355,7 +356,7 @@ public class ProductEditorComp extends Composite implements
* Product transmission callback to report the state of transmitting a
* product.
*/
private ITransmissionState transmissionCB;
private final ITransmissionState transmissionCB;
private final SimpleDateFormat purgeTimeFmt = new SimpleDateFormat("ddHHmm");
@ -374,7 +375,7 @@ public class ProductEditorComp extends Composite implements
*/
private ChangeTimesJob timeUpdater;
private Listener visibilityListener;
private final Listener visibilityListener;
/**
@ -424,8 +425,6 @@ public class ProductEditorComp extends Composite implements
private final DataManager dm;
private boolean updateTime = false;
/**
* Constructor.
*
@ -1191,16 +1190,14 @@ public class ProductEditorComp extends Composite implements
return true;
}
private synchronized boolean changeTimes() {
private boolean changeTimes() {
Calendar GMT = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
GMT.setTime(SimulatedTime.getSystemTime().getTime());
GMT.set(Calendar.SECOND, 0);
Date tt = GMT.getTime();
updateTime = true;
tweakVTEC(tt);
updateIssueExpireTimes(tt);
updateTime = false;
return true;
}
@ -1706,6 +1703,7 @@ public class ProductEditorComp extends Composite implements
textComp.startUpdate();
textComp.patchMND(txt, true);
textComp.updatePType(val);
textComp.endUpdate();
}
@ -1966,16 +1964,22 @@ public class ProductEditorComp extends Composite implements
// before and after strings are different, a reParse() will be made,
// else it will continue on.
if (textComp != null) {
// Update Issue time -- removed
// Update MND time
// Update Issue time
try {
textComp.startUpdate();
ProductDataStruct pds = textComp.getProductDataStruct();
if (!textComp.isCorMode()) {
if (pds != null) {
TextIndexPoints pit = pds.getPIT();
if (pit != null) {
String time = purgeTimeFmt.format(now);
textComp.replaceText(pit, time);
}
}
}
// Update MND time
TextIndexPoints tip = pds.getMndMap().get("nwstime");
if (tip != null) {
SimpleDateFormat fmt = new SimpleDateFormat(
@ -1987,7 +1991,6 @@ public class ProductEditorComp extends Composite implements
textComp.replaceText(tip, issueTime);
}
}
}
} finally {
textComp.endUpdate();
}
@ -2170,6 +2173,8 @@ public class ProductEditorComp extends Composite implements
*/
private void loadPrevious() {
String initialValue;
textComp.setCorMode(true);
if (!testVTEC) {
initialValue = "cccnnnxxx";
} else {
@ -2214,9 +2219,10 @@ public class ProductEditorComp extends Composite implements
}
parseIDs();
revive();
// Enter res mode
setPTypeCategory(PTypeCategory.PE);
textComp.setCorMode(true);
}
/**
@ -3063,8 +3069,4 @@ public class ProductEditorComp extends Composite implements
createCallToActionsMenu(callToActionsSubMenu);
}
protected boolean isUpdateTime() {
return updateTime;
}
}

17
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
View file

@ -90,6 +90,7 @@ import com.raytheon.viz.gfe.textformatter.TextFmtParserUtil;
* 04 FEB 2015 17039 ryu Removed HighlightFramingCodes feature which prevented
* editing of framing codes.
* 07/02/2015 13753 lshi Update times for products in Product Editor
* 08/06/2015 13753 lshi use isSystemTextChange instead of isUpdateTime
*
* </pre>
*
@ -97,6 +98,7 @@ import com.raytheon.viz.gfe.textformatter.TextFmtParserUtil;
* @version 1.0
*
*/
public class StyledTextComp extends Composite {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(StyledTextComp.class);
@ -130,7 +132,7 @@ public class StyledTextComp extends Composite {
/**
* Parent composite.
*/
private ProductEditorComp parent;
private final ProductEditorComp parent;
/**
* Styled text editor.
@ -178,7 +180,7 @@ public class StyledTextComp extends Composite {
private boolean updatingForCor = false;
private ProductEditorLogger peLog;
private final ProductEditorLogger peLog;
private static final String NORM_SEP = "^\\s*$";
@ -303,7 +305,7 @@ public class StyledTextComp extends Composite {
updateTextStyle(event);
checkAutoWrap(event);
if (corMode && !updatingForCor) {
if (corMode && !updatingForCor && !isSystemTextChange()) {
updatingForCor = true;
try {
makeCorrections();
@ -336,11 +338,9 @@ public class StyledTextComp extends Composite {
*/
public void setProductText(String text) {
newProduct = true;
textEditorST.setText(EMPTY);
textEditorST.setStyleRange(null);
try {
parseProductText(text);
textEditorST.setStyleRange(null);
textEditorST.setText(text);
lockText();
findFramingCodes();
@ -348,6 +348,7 @@ public class StyledTextComp extends Composite {
newProduct = false;
} catch (JepException e) {
statusHandler.error(PRODUCT_PARSE_ERROR, e);
textEditorST.setText(EMPTY);
}
}
@ -626,11 +627,7 @@ public class StyledTextComp extends Composite {
}
private void makeCorrections() {
if (!parent.isUpdateTime()) {
parent.setPTypeCategory(PTypeCategory.COR);
}
if (prodDataStruct == null)
return;
List<SegmentData> segs = prodDataStruct.getSegmentsArray();
for (SegmentData seg : segs) {
if (seg.getSementMap().keySet().contains("vtec")) {

18
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
View file

@ -31,6 +31,8 @@
# Mar 23, 2015 #4308 dgilling Export mixedCaseProductIds.txt.
# Apr 28, 2015 #4427 dgilling Support subdomains of the
# primary domains.
# Aug 10, 2015 #17443 lshi Bug in scripts results in rsync_parms.ccc
# file not getting used
#
##
@ -73,7 +75,7 @@ echo "Preparing configuration files for export..."
edexDest=${OUTPUT_DIR}/GFEconfig/edex_static
commonDest=${OUTPUT_DIR}/GFEconfig/common_static
caveDest=${OUTPUT_DIR}/GFEconfig/cave_static
rsyncParms=GFEConfig # DR 16464
rsyncParmsDest=${OUTPUT_DIR}/GFEConfig/site # DR 16464/17443
echo "Making temporary edex configuration directories..."
mkdir -p $edexDest/site
@ -86,7 +88,7 @@ mkdir -p $caveDest/site
# DR 16464
echo "Making temporary rsync_parms directory"
mkdir -p $rsyncParms/site
mkdir -p $rsyncParmsDest
CP_COMMAND="rsync -aq --exclude=*.pyo --exclude=*.pyc --exclude=*.md5"
@ -112,10 +114,10 @@ ${CP_COMMAND} ${LOCALIZATION_PATH}/cave_static/site/${CAPS_SITE}/bundles/maps $c
echo "Copying cave site colormaps configuration for site ${CAPS_SITE} to temporary directory..."
${CP_COMMAND} ${LOCALIZATION_PATH}/common_static/site/${CAPS_SITE}/colormaps $commonDest/site
# DR 16464
if [ -f ${IFPS_DATA}/rsync_parms.${CAPS_SITE} ]; then
echo "Copying the rsync_parms file for site ${CAPS_SITE} to temporary directory..."
cp -a ${IFPS_DATA}/rsync_parms.${CAPS_SITE} $rsyncParms/site
# DR 16464, 17443: CAPS_SITE->SITE (lower case)
if [ -f ${IFPS_DATA}/rsync_parms.${SITE} ]; then
echo "Copying the rsync_parms file for site ${SITE} to temporary directory..."
cp -a ${IFPS_DATA}/rsync_parms.${SITE} $rsyncParmsDest
fi
# Determine if we're exporting for this site or for its subdomains
@ -152,9 +154,9 @@ do
sed -i "s/$ORIG_SITEID/$NEW_SITEID/" ${config}
# rename rsync_parms to use sub-domain site ID
if [ -f ${site_dir}/GFEConfig/site/rsync_parms.${CAPS_SITE} ]
if [ -f ${site_dir}/GFEConfig/site/rsync_parms.${SITE} ]
then
mv ${site_dir}/GFEConfig/site/rsync_parms.${CAPS_SITE} ${site_dir}/GFEConfig/site/rsync_parms.${siteid_caps}
mv ${site_dir}/GFEConfig/site/rsync_parms.${SITE} ${site_dir}/GFEConfig/site/rsync_parms.${siteid_lc}
fi
fi

4
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
View file

@ -19,7 +19,7 @@
# 04/29/15 #4427 dgilling Code cleanup.
# 06/24/15 #16831 bhunder Copy colormaps directory into localization
# directory.
# 06/30/15 #17443 lshi Bug in scripts results in rsync_parms.ccc
# 08/10/15 #17443 lshi Bug in scripts results in rsync_parms.ccc
# file not getting used
##############################################################################
@ -182,7 +182,7 @@ cp -r GFEconfig/cave_static/site/* ${cave_site_dest}
cp -r GFEconfig/common_static/site/colormaps ${common_site_dest}
# DR 17443
cp -a GFEConfig/site/rsync_parms.${SITE_ID_CAPS} ${rsync_parms_dest}
cp -a GFEConfig/site/rsync_parms.${SITE_ID} ${rsync_parms_dest}
echo "Files successfully copied!"
echo "Changing ownership of received configuration"

4
edexOsgi/gov.noaa.nws.sr.oun.edex.mping.feature/feature.xml
View file

@ -21,14 +21,14 @@
id="gov.noaa.nws.sr.oun.dataplugin.mping"
download-size="0"
install-size="0"
version="1.0.0"
version="0.0.0"
unpack="false"/>
<plugin
id="gov.noaa.nws.sr.oun.edex.plugin.mping"
download-size="0"
install-size="0"
version="1.0.0"
version="0.0.0"
unpack="false"/>
</feature>