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

Merge pull request #396 from srcarter3/unidata_18.2.1-osx

Browse source 
Unidata 18.2.1 osx
This commit is contained in:
srcarter3 2021-12-20 16:20:21 -08:00 • committed by GitHub
commit c779207518
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/buildEnvironment.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
# Version
export AWIPSII_VERSION="18.2.1"
export AWIPSII_RELEASE="2"
export AWIPSII_RELEASE="3"
# Author
export AWIPSII_BUILD_VENDOR="UCAR"
export AWIPSII_BUILD_SITE="Unidata"

2
cave/com.raytheon.viz.product.awips/developer.product
View file

@ -61,13 +61,11 @@
</win>
</launcher>
<vm>
<macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
<windows include="true">jdk1.7.0</windows>
</vm>
<plugins>
</plugins>

24
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
View file

@ -208,6 +208,8 @@ import com.vividsolutions.jts.geom.Polygon;
* Nov 17, 2021 srcarter@ucar Set reasonable height, allow proper resizing, remove instructions label call because
* it's null and never used, change bulletlist functionality so it doesn't scroll to the
* top as soon as a user makes a selection
* Dec 20, 2021 srcarter@ucar Check for null before setting layout data on tabs. Make all other components have false
* for vertical expansion so the resizing only resizes the bullet list
* </pre>
*
* @author chammack
@ -431,8 +433,10 @@ IWarningsArrivedListener, ISimulatedTimeChangeListener {
GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
mainComposite.setLayoutData(gd);
tabs.setLayoutData(gd);
if(tabs !=null){
tabs.setLayoutData(gd);
}
createBackupTrackEditGroups(mainComposite);
createRedrawBoxGroup(mainComposite);
createProductTypeGroup(mainComposite);
@ -517,13 +521,13 @@ IWarningsArrivedListener, ISimulatedTimeChangeListener {
gl.verticalSpacing = 2;
gl.marginHeight = 1;
timeRange.setLayout(gl);
timeRange.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1,
timeRange.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1,
1));
Composite timeRangeComp = new Composite(timeRange, SWT.NONE);
timeRangeComp.setLayout(new GridLayout(3, false));
timeRangeComp.setLayoutData(new GridData(SWT.DEFAULT, SWT.FILL, false,
true));
false));
GridData gd = new GridData();
gd.horizontalSpan = 1;
@ -776,7 +780,7 @@ IWarningsArrivedListener, ISimulatedTimeChangeListener {
restartBtn = new Button(backupTrackEditComp, SWT.PUSH);
restartBtn.setText("Reset");
GridData gd = new GridData(SWT.CENTER, SWT.CENTER, true, true);
GridData gd = new GridData(SWT.CENTER, SWT.CENTER, true, false);
gd.widthHint = 100;
restartBtn.setLayoutData(gd);
restartBtn.addSelectionListener(new SelectionAdapter() {
@ -788,7 +792,7 @@ IWarningsArrivedListener, ISimulatedTimeChangeListener {
createTrackGroup(backupTrackEditComp);
createEditGroup(backupTrackEditComp);
gd = new GridData(SWT.FILL, SWT.FILL, true, true);
gd = new GridData(SWT.FILL, SWT.FILL, true, false);
gd.heightHint = 40;
instructionsBox = new Text(mainComposite, SWT.NONE | SWT.READ_ONLY
| SWT.MULTI);
@ -805,7 +809,7 @@ IWarningsArrivedListener, ISimulatedTimeChangeListener {
gl.marginHeight = 1;
trackGroup.setLayout(gl);
trackGroup.setLayoutData(new GridData(SWT.DEFAULT, SWT.FILL, false,
true));
false));
trackGroup.setBackgroundMode(SWT.INHERIT_NONE);
oneStorm = new Button(trackGroup, SWT.RADIO);
@ -849,7 +853,7 @@ IWarningsArrivedListener, ISimulatedTimeChangeListener {
gl.marginHeight = 1;
editGroup.setLayout(gl);
editGroup.setLayoutData(
new GridData(SWT.DEFAULT, SWT.FILL, false, true));
new GridData(SWT.DEFAULT, SWT.FILL, false, false));
box = new Button(editGroup, SWT.RADIO);
box.setText("Box");
@ -897,7 +901,7 @@ IWarningsArrivedListener, ISimulatedTimeChangeListener {
okButton = new Button(buttonComp, SWT.PUSH);
okButton.setText(OK_BTN_LABEL);
GridData gd = new GridData(SWT.CENTER, SWT.CENTER, true, true);
GridData gd = new GridData(SWT.CENTER, SWT.CENTER, true, false);
gd.widthHint = 100;
okButton.setLayoutData(gd);
okButton.addSelectionListener(new SelectionAdapter() {
@ -917,7 +921,7 @@ IWarningsArrivedListener, ISimulatedTimeChangeListener {
Button btn = new Button(buttonComp, SWT.PUSH);
btn.setText(CLOSE_BUTTON_LABEL);
gd = new GridData(SWT.CENTER, SWT.CENTER, true, true);
gd = new GridData(SWT.CENTER, SWT.CENTER, true, false);
gd.widthHint = 100;
btn.setLayoutData(gd);
btn.addSelectionListener(new SelectionAdapter() {

16
rpms/awips2.edex/Installer.edex/component.spec
View file

@ -61,6 +61,20 @@ mkdir -p %{_build_root}/awips2/edex/data/share
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p %{_build_root}/awips2/edex/data/ndm
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p %{_build_root}/awips2/dev
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p %{_build_root}/awips2/dev/logs
if [ $? -ne 0 ]; then
exit 1
fi
/bin/cp -r %{_baseline_workspace}/rpms/awips2.edex/Installer.edex/programs/qpidNotify.py ${RPM_BUILD_ROOT}/awips2/edex/bin/
@ -194,6 +208,8 @@ rm -rf ${RPM_BUILD_ROOT}
%dir /awips2/edex/bin
/awips2/edex/bin/*.sh
/awips2/edex/bin/scriptLauncher
#%dir /awips2/dev/logs
%attr(755,awips,fxalpha) /awips2/edex/bin/qpidNotify.py
%attr(755,awips,fxalpha) /awips2/dev/updateNDM.pl
%attr(755,awips,fxalpha) /awips2/dev/logs/updateNDM.log
%attr(744,root,root) /etc/init.d/edex_camel