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

Merge "Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily" into omaha_14.4.1

Browse source 
Former-commit-id: 0ee832fc2f [formerly 0a6287431cbcc43ad6f42898a94d173fe451566e]
Former-commit-id: 625f0db18f
This commit is contained in:
Nate Jensen 2014-08-28 11:30:45 -05:00 • committed by Gerrit Code Review
commit 9fe0e6df69
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/SiteActivationDlg.java
View file

@ -40,6 +40,9 @@ import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import com.raytheon.uf.common.jms.notification.INotificationObserver;
import com.raytheon.uf.common.jms.notification.NotificationException;
import com.raytheon.uf.common.jms.notification.NotificationMessage;
import com.raytheon.uf.common.site.notify.SiteActivationNotification;
import com.raytheon.uf.common.site.requests.ActivateSiteRequest;
import com.raytheon.uf.common.site.requests.DeactivateSiteRequest;
@ -51,9 +54,6 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.auth.UserController;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.notification.INotificationObserver;
import com.raytheon.uf.viz.core.notification.NotificationException;
import com.raytheon.uf.viz.core.notification.NotificationMessage;
import com.raytheon.uf.viz.core.notification.jobs.NotificationManagerJob;
import com.raytheon.uf.viz.core.requests.ThriftClient;
import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
@ -69,6 +69,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
* ------------ ---------- ----------- --------------------------
* Aug 5, 2011 randerso Initial creation
* Oct 26, 2012 1287 rferrel Code clean up for non-blocking dialog.
* Aug 28, 2014 3563 randerso Move to the new common INotificationObserer code
*
* </pre>
*
@ -78,6 +79,8 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
public class SiteActivationDlg extends CaveJFACEDialog implements
INotificationObserver {
private static final String SITE_ACTIVATION_TOPIC = "edex.alerts.siteActivate";
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(SiteActivationDlg.class);
@ -114,8 +117,8 @@ public class SiteActivationDlg extends CaveJFACEDialog implements
newShell.addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e) {
NotificationManagerJob.removeObserver(
"edex.alerts.siteActivate", SiteActivationDlg.this);
NotificationManagerJob.removeObserver(SITE_ACTIVATION_TOPIC,
SiteActivationDlg.this);
}
});
}
@ -210,8 +213,7 @@ public class SiteActivationDlg extends CaveJFACEDialog implements
logRoll.setLayoutData(layoutData);
if (CheckPermissions.getAuthorization()) {
NotificationManagerJob
.addObserver("edex.alerts.siteActivate", this);
NotificationManagerJob.addObserver(SITE_ACTIVATION_TOPIC, this);
updateActiveSites();
} else {

4
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
View file

@ -105,6 +105,7 @@ import com.vividsolutions.jts.simplify.TopologyPreservingSimplifier;
* warnings clean up.
* Sep 30, 2013 #2361 njensen Use JAXBManager for XML
* Jan 21, 2014 #2720 randerso Improve efficiency of merging polygons in edit area generation
* Aug 27, 2014 #3563 randerso Fix issue where edit areas are regenerated unnecessarily
*
* </pre>
*
@ -165,6 +166,7 @@ public class MapManager {
.getAbsolutePath();
LocalizationContext edexStaticConfig = pathMgr.getContext(
LocalizationType.EDEX_STATIC, LocalizationLevel.CONFIGURED);
edexStaticConfig.setContextName(siteId);
this.edexStaticConfigDir = pathMgr.getFile(edexStaticConfig, ".")
.getAbsolutePath();
LocalizationContext edexStaticSite = pathMgr.getContextForSite(
@ -298,6 +300,8 @@ public class MapManager {
newestSource = Math.max(newestSource, file.lastModified());
localMapsTag.mkdirs();
} else if (localMapsTag.exists()) {
statusHandler
.info("localMaps.py file removed. Edit areas will be regenerated.");
localMapsTag.delete();
newestSource = System.currentTimeMillis();
}