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

Merge "Issue #2220 Removed synchronized from most methods." into development

Browse source 
Former-commit-id: 89894b6f7d [formerly e0194aa022] [formerly d79c7c1b84] [formerly 084d39c6f3 [formerly d79c7c1b84 [formerly 5d93f17fc5fcb0cd98e5b4bf3681fc9bc244b993]]]
Former-commit-id: 084d39c6f3
Former-commit-id: 7c8d8d740241500fd1596cf042c785f1d1a49abd [formerly b23a59a114]
Former-commit-id: 05aac96abd
This commit is contained in:
Richard Peter 2013-08-05 14:27:33 -05:00 • committed by Gerrit Code Review
commit 858be1c9ac
3 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/data/CategoryInfo.java
View file

@ -20,6 +20,7 @@
package com.raytheon.uf.viz.archive.data;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import com.raytheon.uf.common.archive.config.DisplayData;
@ -50,7 +51,7 @@ public class CategoryInfo {
private final String categoryName;
/** List of display items for the category. */
private final List<DisplayData> displayDataList = new ArrayList<DisplayData>();
private List<DisplayData> displayDataList;
/**
* Constructor.
@ -63,6 +64,8 @@ public class CategoryInfo {
List<DisplayData> displayInfoList) {
this.archiveName = archiveName;
this.categoryName = categoryName;
this.displayDataList = new ArrayList<DisplayData>(
displayInfoList.size());
this.displayDataList.addAll(displayInfoList);
}
@ -75,6 +78,6 @@ public class CategoryInfo {
}
public List<DisplayData> getDisplayDataList() {
return new ArrayList<DisplayData>(displayDataList);
return Collections.unmodifiableList(displayDataList);
}
}

32
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/data/SizeJob.java
View file

@ -141,10 +141,9 @@ public class SizeJob extends Job {
/**
* Force getting the sizes for all data in the archive Information map.
*/
public synchronized void recomputeSize() {
public void recomputeSize() {
clearQueue();
for (String archiveName : archiveInfoMap.keySet()) {
ArchiveInfo archiveInfo = archiveInfoMap.get(archiveName);
for (ArchiveInfo archiveInfo : archiveInfoMap.values()) {
for (String categoryName : archiveInfo.getCategoryNames()) {
CategoryInfo categoryInfo = archiveInfo.get(categoryName);
for (DisplayData displayData : categoryInfo
@ -161,6 +160,8 @@ public class SizeJob extends Job {
}
}
}
// Forces update of current display.
displaySizesComputed.set(false);
if (getState() == Job.NONE) {
@ -173,14 +174,14 @@ public class SizeJob extends Job {
*
* @param fileInfo
*/
private synchronized void requeue(DisplayData displayData) {
private void requeue(DisplayData displayData) {
if (!shutdown.get()) {
requeueRequest.set(false);
if (displayData.isSelected()) {
selectedQueue.add(displayData);
backgroundQueue.remove(displayData);
} else {
selectedQueue.remove(backgroundQueue);
selectedQueue.remove(displayData);
backgroundQueue.add(displayData);
}
@ -217,12 +218,12 @@ public class SizeJob extends Job {
/**
* @return archiveNames
*/
public synchronized Set<String> getArchiveNames() {
public Set<String> getArchiveNames() {
return archiveInfoMap.keySet();
}
/**
* Change the selection state and if requeue size request.
* Change the selection state and requeue size request.
*
* @param archiveName
* @param categoryName
@ -251,17 +252,18 @@ public class SizeJob extends Job {
* @param archiveName
* @param categoryName
*/
public synchronized void changeDisplayQueue(String archiveName,
String categoryName) {
public void changeDisplayQueue(String archiveName, String categoryName) {
if (!archiveName.equals(displayArchive)
|| !categoryName.equals(displayCategory)) {
if (getState() != Job.NONE) {
requeueRequest.set(true);
stopComputeSize.set(true);
synchronized (this) {
if (getState() != Job.NONE) {
requeueRequest.set(true);
stopComputeSize.set(true);
}
displaySizesComputed.set(false);
displayArchive = archiveName;
displayCategory = categoryName;
}
displaySizesComputed.set(false);
displayArchive = archiveName;
displayCategory = categoryName;
}
}

2
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/DisplayData.java
View file

@ -243,7 +243,7 @@ public class DisplayData implements Comparable<DisplayData> {
public String toString() {
StringBuilder sb = new StringBuilder("DisplayData[");
sb.append("displayLabel: ").append(displayLabel);
sb.append(", isSlected: ").append(selected);
sb.append(", isSlected: ").append(isSelected());
sb.append(", size: ").append(size);
sb.append(", category.name: ").append(categoryConfig.getName());
sb.append(", archive.name: ").append(archiveConfig.getName())