Commit: 133036ab8a7b9daaf24672798967e0ffdd9060f8 - TinyBannavi (git)

タイニー番組ナビゲータ本体

Commit MetaInfo

• Revision: 133036ab8a7b9daaf24672798967e0ffdd9060f8 (tree)
• Time: 2018-08-12 23:03:36
• Author: Masahiko Kimura <mkimura@u01....>
• Commiter: Masahiko Kimura

Log Message

1.6.7 (2018/8/12):
1. ［タイトル一覧］RD-X8でタブをクリックすると異常終了する問題の対応

Change Summary

• modified: TinyBannavi/src/tainavi/AbsTitleListView.java
• modified: TinyBannavi/src/tainavi/VersionInfo.java

Incremental Difference

--- a/TinyBannavi/src/tainavi/AbsTitleListView.java
+++ b/TinyBannavi/src/tainavi/AbsTitleListView.java
@@ -438,7 +438,13 @@ public abstract class AbsTitleListView extends JPanel {
 
 		titleUpdating = true;
 		String device_id = getSelectedDeviceId();
+		if (device_id == null)
+			return;
+
 		String device_name = rec.getDeviceName(device_id);
+		if (device_name == null)
+			return;
+
 		String folder_name = getSelectedFolderName();
 
 		if (force){
@@ -465,9 +471,8 @@ public abstract class AbsTitleListView extends JPanel {
 						updateDeviceInfoLabel();
 					}
 
-					if (titles){
-						String devId = getSelectedDeviceId();
-
+					String devId = getSelectedDeviceId();
+					if (titles && devId != null){
 						StWin.appendMessage(MSGID+"レコーダからタイトル一覧を取得します(force=" + String.valueOf(force) + ",details=" + String.valueOf(details) + ")："+devId);
 						if (rec.GetRdTitles(devId, force, details, devId.equals(HDDRecorder.DEVICE_ALL))){
 							MWin.appendMessage(MSGID+"レコーダからタイトル一覧が正常に取得できました："+devId);
@@ -521,9 +526,8 @@ public abstract class AbsTitleListView extends JPanel {
 				updateDeviceInfoLabel();
 			}
 
-			if (titles){
-				String devId = getSelectedDeviceId();
-
+			String devId = getSelectedDeviceId();
+			if (titles && devId != null){
 				StWin.appendMessage(MSGID+"レコーダからタイトル一覧を取得します(force=" + String.valueOf(force) + ",details=" + String.valueOf(details) + ")："+devId);
 				if (rec.GetRdTitles(devId, force, details, devId.equals(HDDRecorder.DEVICE_ALL))){
 //					MWin.appendMessage(MSGID+"レコーダからタイトル一覧が正常に取得できました："+devId);
@@ -583,7 +587,8 @@ public abstract class AbsTitleListView extends JPanel {
 			no++;
 		}
 
-		combo.setSelectedIndex(idx);
+		if (no > 0)
+			combo.setSelectedIndex(idx);
 		combo.setEnabled( combo.getItemCount() > 0 );
 		deviceUpdating = false;
 	}
@@ -599,7 +604,7 @@ public abstract class AbsTitleListView extends JPanel {
 		String s = "残量(DR):";
 
 		String device_id = getSelectedDeviceId();
-		DeviceInfo info = rec.GetRDDeviceInfo(device_id);
+		DeviceInfo info = device_id != null ? rec.GetRDDeviceInfo(device_id) : null;
 		if (info != null){
 			int allsize = info.getAllSize();
 			int freesize = info.getFreeSize();
@@ -622,7 +627,9 @@ public abstract class AbsTitleListView extends JPanel {
 			return;
 
 		String device_id = getSelectedDeviceId();
-		String device_name = "[" + rec.getDeviceName(device_id) + "]";
+		String device_name = device_id != null ? rec.getDeviceName(device_id) : null;
+		if (device_name != null)
+			device_name = "[" + device_name + "]";
 
 		JComboBoxPanel combo = jCBXPanel_folder;
 		ArrayList<TextValueSet> tvs = rec.getFolderList();
@@ -640,7 +647,8 @@ public abstract class AbsTitleListView extends JPanel {
 			no++;
 		}
 
-		combo.setSelectedIndex(idx);
+		if (no > 0)
+			combo.setSelectedIndex(idx);
 		combo.setEnabled( combo.getItemCount() > 0 );
 	}
 
@@ -791,7 +799,7 @@ public abstract class AbsTitleListView extends JPanel {
 			return;
 
 		String folder_name = getSelectedFolderName();
-		String folder_id = text2value(rec.getFolderList(), folder_name);
+		String folder_id = folder_name != null ? text2value(rec.getFolderList(), folder_name) : "";
 
 		// ジャンルが選択されている場合、そのジャンルに属するタイトル以外はスキップする
 		String genre_name = (String)jCBXPanel_genre.getSelectedItem();
@@ -990,7 +998,7 @@ public abstract class AbsTitleListView extends JPanel {
 
 			HDDRecorder rec = getSelectedRecorder();
 			String folder_name = getSelectedFolderName();
-			String folder_id = text2value(rec.getFolderList(), folder_name);
+			String folder_id = folder_name != null ? text2value(rec.getFolderList(), folder_name) : "";
 
 			editFolderName(folder_id, folder_name);
 		}
@@ -1075,6 +1083,9 @@ public abstract class AbsTitleListView extends JPanel {
 			HDDRecorder rec = getSelectedRecorder();
 
 			String folder_name = getSelectedFolderName();
+			if (folder_name == null)
+				return;
+
 			Matcher ma = Pattern.compile("^\\[(.*)\\] (.*)$").matcher(folder_name);
 			final String device_name = ma.find() ? ma.group(1) : "";
 			final String device_id = rec.getDeviceID(device_name);

--- a/TinyBannavi/src/tainavi/VersionInfo.java
+++ b/TinyBannavi/src/tainavi/VersionInfo.java
@@ -5,7 +5,7 @@ import java.util.regex.Pattern;
 
 
 public class VersionInfo {
-	private static final String Version = "タイニー番組ナビゲータ for DBR-T2007　3.22.18β+1.6.6";
+	private static final String Version = "タイニー番組ナビゲータ for DBR-T2007　3.22.18β+1.6.7";
 
 	private static final String OSname = System.getProperty("os.name");
 	private static final String OSvers = System.getProperty("os.version");