Fix threading of project size calculation. Fix issue with reading syllabification information for compound-phone diphthongs.

Author: ghedlund

app/src/main/java/ca/phon/app/project/RecentProjectsList.java

@@ -32,6 +32,7 @@
 import ca.phon.ui.action.*;
 import ca.phon.util.*;
 import ca.phon.util.icons.*;
+import ca.phon.worker.PhonWorker;
 
 public class RecentProjectsList extends JPanel {
 
@@ -82,13 +83,18 @@ public void mouseClicked(MouseEvent me) {
 	public void updateProjectList() {
 		buttonPanel.removeAll();
 		buttonPanel.revalidate();
+
+		PhonWorker worker = PhonWorker.createWorker();
+		worker.setFinishWhenQueueEmpty(true);
 
 		final RecentProjects history = new RecentProjects();
 
 		boolean stripeRow = false;
 		for(File projectFolder:history) {
 			final LocalProjectButton projectButton = getProjectButton(projectFolder);
-			
+
+			projectButton.updateProjectSize(worker);
+
 			if(stripeRow) {
 				projectButton.setBackground(PhonGuiConstants.PHON_UI_STRIP_COLOR);
 				stripeRow = false;
@@ -99,6 +105,7 @@ public void updateProjectList() {
 
 			buttonPanel.add(projectButton);
 		}
+		worker.start();
 	}
 
 	private LocalProjectButton getProjectButton(File projectFolder) {

app/src/main/java/ca/phon/app/welcome/FolderProjectList.java

@@ -143,10 +143,17 @@ private void updateProjectList() {
 		listPanel.removeAll();
 		listPanel.revalidate();
 		listPanel.repaint();
+
+		PhonWorker worker = PhonWorker.createWorker();
+		worker.setFinishWhenQueueEmpty(true);
 
 		boolean stripRow = false;
 		for(MultiActionButton btn:projectButtons) {
 			listPanel.add(btn);
+
+			if(btn instanceof LocalProjectButton) {
+				((LocalProjectButton) btn).updateProjectSize(worker);
+			}
 
 			if(stripRow) {
 				btn.setBackground(PhonGuiConstants.PHON_UI_STRIP_COLOR);
@@ -156,7 +163,8 @@ private void updateProjectList() {
 				stripRow = true;
 			}
 		}
-		
+
+		worker.start();
 		revalidate();
 		listPanel.revalidate();
 		listPanel.repaint();

app/src/main/java/ca/phon/app/welcome/LocalProjectButton.java

@@ -57,8 +57,10 @@ public LocalProjectButton(File projFile) {
 		setBackgroundPainter(bgPainter);
 
 		setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+	}
 
-		PhonWorker.getInstance().invokeLater(new ProjectSizeCalcTask());
+	public void updateProjectSize(PhonWorker worker) {
+		worker.invokeLater(new ProjectSizeCalcTask());
 	}
 
 	/**
@@ -158,8 +160,11 @@ private long getSize(File f) {
 			// return size of file
 			retVal = f.length();
 		} else if(f.isDirectory()) {
-			for(File lf:f.listFiles()) {
-				retVal += getSize(lf);
+			File[] files = f.listFiles();
+			if(files != null) {
+				for (File lf : files) {
+					retVal += getSize(lf);
+				}
 			}
 		}
 		return retVal;

session/src/main/java/ca/phon/session/io/xml/v12/XMLSessionReader_v12.java

@@ -643,9 +643,13 @@ public void visitCompoundPhone(CompoundPhone cp) {
 					(eleIdx < syllabification.size() ? syllabification.get(eleIdx++) : null);
 			if(ct != null) {
 				final ConstituentTypeType ctt = ct.getScType();
+				final SyllabificationInfo info = cp.getExtension(SyllabificationInfo.class);
 				final SyllableConstituentType scType = SyllableConstituentType.fromString(ctt.toString());
 				if(scType != null) {
-					cp.setScType(scType);
+					info.setConstituentType(scType);
+					if(scType == SyllableConstituentType.NUCLEUS) {
+						info.setDiphthongMember(!ct.isHiatus());
+					}
 				}
 			}
 		}