OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

inqubus: Commit

いんきゅばす(仮称; 旧名: さきゅばすのNicoBrowser拡張版)


Commit MetaInfo

Révisiondd23278b166893c0e9d74f2e5b56ce38b4a00e26 (tree)
l'heure2012-05-12 20:09:45
Auteuryukihane <yukihane.feather@gmai...>
Commiteryukihane

Message de Log

Merge branch 'only_owner_comment'

Change Summary

Modification

--- a/frontend/src/saccubus/worker/impl/download/Download.java
+++ b/frontend/src/saccubus/worker/impl/download/Download.java
@@ -98,10 +98,12 @@ public class Download extends Worker<DownloadResult, DownloadProgress> {
9898 final File file = new File(profile.getCommentProfile().getDir(), name);
9999
100100 final EnumSet<DownloadCommentType> commentSet = EnumSet.of(DownloadCommentType.OWNER);
101- if (profile.getCommentProfile().isDisablePerMinComment()) {
102- commentSet.add(DownloadCommentType.COMMENT_OLD);
103- } else {
104- commentSet.add(DownloadCommentType.COMMENT);
101+ if (!profile.getCommentProfile().isOwnerCommentOnly()) {
102+ if (profile.getCommentProfile().isDisablePerMinComment()) {
103+ commentSet.add(DownloadCommentType.COMMENT_OLD);
104+ } else {
105+ commentSet.add(DownloadCommentType.COMMENT);
106+ }
105107 }
106108 commentFile = client.getCommentFile(vi, file.getPath(), commentSet, wbi, profile.getCommentProfile().
107109 getLengthRelatedCommentSize());
--- a/frontend/src/saccubus/worker/profile/CommentProfile.java
+++ b/frontend/src/saccubus/worker/profile/CommentProfile.java
@@ -16,6 +16,13 @@ public interface CommentProfile extends Inputable {
1616
1717 /**
1818 * @return {@link #isDownload()}がtrueの場合に,
19+ * 投稿者コメントのみ取得する場合はtrue. 通常コメントも取得する場合はfalse.
20+ * {@link #isDownload()}がfalseの場合未定義.
21+ */
22+ boolean isOwnerCommentOnly();
23+
24+ /**
25+ * @return {@link #isDownload()}がtrueの場合に,
1926 * 昔の仕様でコメントダウンロードを行う場合はtrue. 現在の仕様で行う場合はfalse.
2027 * {@link #isDownload()}がfalseの場合未定義.
2128 */
--- a/frontend/src/yukihane/inqubus/config/ConfigCommentProfile.java
+++ b/frontend/src/yukihane/inqubus/config/ConfigCommentProfile.java
@@ -49,6 +49,11 @@ public class ConfigCommentProfile implements CommentProfile {
4949 }
5050
5151 @Override
52+ public boolean isOwnerCommentOnly() {
53+ return false;
54+ }
55+
56+ @Override
5257 public boolean isDownload() {
5358 return download;
5459 }
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -22,7 +22,6 @@ import java.beans.PropertyChangeEvent;
2222 import java.beans.PropertyChangeListener;
2323 import java.io.File;
2424 import java.io.IOException;
25-import java.net.MalformedURLException;
2625 import java.net.URL;
2726 import java.nio.file.FileSystem;
2827 import java.nio.file.FileSystems;
@@ -32,8 +31,6 @@ import java.util.HashSet;
3231 import java.util.List;
3332 import java.util.Set;
3433 import java.util.SortedSet;
35-import org.slf4j.Logger;
36-import org.slf4j.LoggerFactory;
3734 import javax.swing.BorderFactory;
3835 import javax.swing.DefaultComboBoxModel;
3936 import javax.swing.DropMode;
@@ -61,6 +58,8 @@ import javax.swing.border.BevelBorder;
6158 import javax.swing.table.TableModel;
6259 import org.apache.commons.configuration.ConfigurationException;
6360 import org.apache.commons.lang.builder.ToStringBuilder;
61+import org.slf4j.Logger;
62+import org.slf4j.LoggerFactory;
6463 import saccubus.MainFrame_AboutBox;
6564 import saccubus.util.WayBackTimeParser;
6665 import saccubus.worker.profile.CommentProfile;
@@ -215,18 +214,12 @@ public class MainFrame extends JFrame {
215214 cbBackLogReduce.setToolTipText("「コメントの量を減らす」場合はチェックを付けます。");
216215
217216 cbCommentLocal = new JCheckBox();
218- cbCommentLocal.addItemListener(new ItemListener() {
217+ cbOwnerComment = new JCheckBox();
219218
220- @Override
221- public void itemStateChanged(ItemEvent e) {
222- final boolean selected = (e.getStateChange() == ItemEvent.SELECTED);
223- cbBackLogReduce.setEnabled(!selected);
224- cbBackLog.setEnabled(!selected);
225- }
226- });
227219 btnComment.addActionListener(
228220 new FileChooseActionListener(MainFrame.this, JFileChooser.FILES_ONLY, fldComment));
229221 fldComment.setTransferHandler(new ContentTransferHandler(fldComment.getTransferHandler(), cbCommentLocal));
222+
230223 final JLabel lblOutput = new JLabel();
231224 cbOutputEnable = new JCheckBox();
232225 fldOutput = new JTextField();
@@ -300,14 +293,20 @@ public class MainFrame extends JFrame {
300293 lblComment.setText("コメント");
301294
302295 cbCommentLocal.setText("local");
303- cbCommentLocal.addItemListener(new java.awt.event.ItemListener() {
296+ cbCommentLocal.addItemListener(new ItemListener() {
304297
305298 @Override
306- public void itemStateChanged(java.awt.event.ItemEvent evt) {
307- useMovieLocalCheckBoxItemStateChanged(evt);
299+ public void itemStateChanged(ItemEvent e) {
300+ useMovieLocalCheckBoxItemStateChanged(e);
301+ final boolean selected = (e.getStateChange() == ItemEvent.SELECTED);
302+ cbBackLogReduce.setEnabled(!selected);
303+ cbBackLog.setEnabled(!selected);
304+ cbOwnerComment.setEnabled(!selected);
308305 }
309306 });
310307
308+ cbOwnerComment.setText("投コメのみ");
309+
311310 lblOutput.setText("出力");
312311
313312 cbOutputEnable.setText("変換");
@@ -329,12 +328,6 @@ public class MainFrame extends JFrame {
329328 .addComponent(lblId)
330329 .addPreferredGap(ComponentPlacement.RELATED)
331330 .addComponent(cmbId, GroupLayout.PREFERRED_SIZE, 100, Short.MAX_VALUE)
332- .addPreferredGap(ComponentPlacement.UNRELATED)
333- .addComponent(cbBackLogReduce)
334- .addPreferredGap(ComponentPlacement.UNRELATED)
335- .addComponent(cbBackLog)
336- .addPreferredGap(ComponentPlacement.RELATED)
337- .addComponent(fldBackLog, GroupLayout.PREFERRED_SIZE, 150, GroupLayout.PREFERRED_SIZE)
338331 .addContainerGap()
339332 )
340333 .addGroup(glInputMain.createSequentialGroup()
@@ -346,21 +339,34 @@ public class MainFrame extends JFrame {
346339 )
347340 .addPreferredGap(ComponentPlacement.RELATED)
348341 .addGroup(glInputMain.createParallelGroup(Alignment.LEADING)
349- .addComponent(cbVideoLocal)
350- .addComponent(cbCommentLocal)
351- .addComponent(cbOutputEnable)
352- )
353- .addPreferredGap(ComponentPlacement.RELATED)
354- .addGroup(glInputMain.createParallelGroup(Alignment.LEADING)
355- .addComponent(cmbVideo, 300, 300, Short.MAX_VALUE)
356- .addComponent(cmbComment, 300, 300, Short.MAX_VALUE)
357- .addComponent(fldOutput, 300, 300, Short.MAX_VALUE)
342+ .addGroup(glInputMain.createSequentialGroup()
343+ .addGroup(glInputMain.createParallelGroup(Alignment.LEADING)
344+ .addComponent(cbVideoLocal)
345+ .addComponent(cbCommentLocal)
346+ .addComponent(cbOutputEnable)
347+ )
348+ .addPreferredGap(ComponentPlacement.RELATED)
349+ .addGroup(glInputMain.createParallelGroup(Alignment.LEADING)
350+ .addComponent(cmbVideo, 300, 300, Short.MAX_VALUE)
351+ .addComponent(cmbComment, 300, 300, Short.MAX_VALUE)
352+ .addComponent(fldOutput, 300, 300, Short.MAX_VALUE)
353+ )
354+ .addGroup(glInputMain.createParallelGroup()
355+ .addComponent(btnVideo)
356+ .addComponent(btnComment)
357+ )
358+ .addContainerGap()
359+ )
360+ .addGroup(glInputMain.createSequentialGroup()
361+ .addComponent(cbOwnerComment)
362+ .addPreferredGap(ComponentPlacement.UNRELATED)
363+ .addComponent(cbBackLogReduce)
364+ .addPreferredGap(ComponentPlacement.UNRELATED)
365+ .addComponent(cbBackLog)
366+ .addPreferredGap(ComponentPlacement.RELATED)
367+ .addComponent(fldBackLog, GroupLayout.PREFERRED_SIZE, 150, GroupLayout.PREFERRED_SIZE)
368+ )
358369 )
359- .addGroup(glInputMain.createParallelGroup()
360- .addComponent(btnVideo)
361- .addComponent(btnComment)
362- )
363- .addContainerGap()
364370 )
365371 );
366372
@@ -371,9 +377,6 @@ public class MainFrame extends JFrame {
371377 .addGroup(glInputMain.createParallelGroup(Alignment.BASELINE)
372378 .addComponent(cmbId, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
373379 .addComponent(lblId)
374- .addComponent(cbBackLogReduce)
375- .addComponent(cbBackLog)
376- .addComponent(fldBackLog)
377380 )
378381 .addPreferredGap(ComponentPlacement.RELATED)
379382 .addGroup(glInputMain.createParallelGroup(Alignment.BASELINE)
@@ -391,6 +394,13 @@ public class MainFrame extends JFrame {
391394 )
392395 .addPreferredGap(ComponentPlacement.RELATED)
393396 .addGroup(glInputMain.createParallelGroup(Alignment.BASELINE)
397+ .addComponent(cbOwnerComment)
398+ .addComponent(cbBackLogReduce)
399+ .addComponent(cbBackLog)
400+ .addComponent(fldBackLog)
401+ )
402+ .addPreferredGap(ComponentPlacement.RELATED)
403+ .addGroup(glInputMain.createParallelGroup(Alignment.BASELINE)
394404 .addComponent(lblOutput)
395405 .addComponent(fldOutput, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
396406 .addComponent(cbOutputEnable)
@@ -689,6 +699,7 @@ public class MainFrame extends JFrame {
689699 private final FileComboBox cmbComment = new FileComboBox();
690700 private final JTextField fldComment = cmbComment.getEditorComponent();
691701 private final JButton btnComment = new JButton("...");
702+ private final JCheckBox cbOwnerComment;
692703 private final JCheckBox cbOutputEnable;
693704 private final JTextField fldOutput;
694705 // 入力領域 - ffmpeg
@@ -921,6 +932,7 @@ public class MainFrame extends JFrame {
921932
922933 private class InqubusCommentProfile extends ConfigCommentProfile {
923934 private final boolean download;
935+ private final boolean ownerCommentOnly;
924936 private final File dir;
925937 private final String fileName;
926938 private final File localFile;
@@ -936,10 +948,12 @@ public class MainFrame extends JFrame {
936948 this.dir = new File(p.getCommentDir());
937949 this.fileName = fldComment.getText();
938950 this.localFile = null;
951+ this.ownerCommentOnly = cbOwnerComment.isSelected();
939952 } else {
940953 this.dir = null;
941954 this.fileName = null;
942955 this.localFile = new File(fldComment.getText());
956+ this.ownerCommentOnly = false;
943957 }
944958
945959 if(cbBackLog.isSelected()) {
@@ -961,6 +975,11 @@ public class MainFrame extends JFrame {
961975 }
962976
963977 @Override
978+ public boolean isOwnerCommentOnly(){
979+ return this.ownerCommentOnly;
980+ }
981+
982+ @Override
964983 public File getDir() {
965984 return this.dir;
966985 }
Afficher sur ancien navigateur de dépôt.