瀏覽代碼

Don't default the nicklist{fore,back}groundcolour settings, just let

them fall-through.
Minor import fixes
tags/0.6.3m1rc1
Chris Smith 15 年之前
父節點
當前提交
4c3d54a64e

+ 2
- 2
src/com/dmdirc/config/defaults/default/defaults 查看文件

156
   maximisewindows=true
156
   maximisewindows=true
157
   mdiBarVisibility=showWhenMaximised
157
   mdiBarVisibility=showWhenMaximised
158
   nickListAltBackgroundColour=false:f0f0f0
158
   nickListAltBackgroundColour=false:f0f0f0
159
-  nicklistbackgroundcolour=0
160
-  nicklistforegroundcolour=1
159
+  nicklistbackgroundcolour=false:0
160
+  nicklistforegroundcolour=false:1
161
   pasteProtectionLimit=1
161
   pasteProtectionLimit=1
162
   quickCopy=false
162
   quickCopy=false
163
   shownickcoloursinnicklist=true
163
   shownickcoloursinnicklist=true

+ 2
- 10
test/com/dmdirc/addons/ui_swing/components/InputTextFrameTest.java 查看文件

22
 
22
 
23
 package com.dmdirc.addons.ui_swing.components;
23
 package com.dmdirc.addons.ui_swing.components;
24
 
24
 
25
-import com.dmdirc.addons.ui_swing.components.TextAreaInputField;
26
-import com.dmdirc.addons.ui_swing.components.InputTextFrame;
27
-import com.dmdirc.WritableFrameContainer;
28
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
25
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
29
 import com.dmdirc.config.ConfigManager;
26
 import com.dmdirc.config.ConfigManager;
30
 import com.dmdirc.config.IdentityManager;
27
 import com.dmdirc.config.IdentityManager;
33
 import com.dmdirc.harness.ui.ClassFinder;
30
 import com.dmdirc.harness.ui.ClassFinder;
34
 import com.dmdirc.harness.ui.UIClassTestRunner;
31
 import com.dmdirc.harness.ui.UIClassTestRunner;
35
 import com.dmdirc.harness.ui.UITestIface;
32
 import com.dmdirc.harness.ui.UITestIface;
36
-
37
 import com.dmdirc.ui.WindowManager;
33
 import com.dmdirc.ui.WindowManager;
38
-import com.dmdirc.ui.interfaces.Window;
39
 import com.dmdirc.addons.ui_swing.CustomInputFrame;
34
 import com.dmdirc.addons.ui_swing.CustomInputFrame;
40
 import com.dmdirc.addons.ui_swing.SwingController;
35
 import com.dmdirc.addons.ui_swing.SwingController;
41
 import com.dmdirc.addons.ui_swing.UIUtilities;
36
 import com.dmdirc.addons.ui_swing.UIUtilities;
42
-import java.awt.Toolkit;
43
-import java.awt.datatransfer.StringSelection;
37
+
44
 import java.awt.event.KeyEvent;
38
 import java.awt.event.KeyEvent;
45
-import javax.swing.text.JTextComponent;
39
+
46
 import org.fest.swing.core.EventMode;
40
 import org.fest.swing.core.EventMode;
47
 import org.fest.swing.core.KeyPressInfo;
41
 import org.fest.swing.core.KeyPressInfo;
48
 import org.fest.swing.core.matcher.DialogByTitleMatcher;
42
 import org.fest.swing.core.matcher.DialogByTitleMatcher;
50
 import org.fest.swing.fixture.DialogFixture;
44
 import org.fest.swing.fixture.DialogFixture;
51
 import org.fest.swing.fixture.FrameFixture;
45
 import org.fest.swing.fixture.FrameFixture;
52
 import org.fest.swing.fixture.JInternalFrameFixture;
46
 import org.fest.swing.fixture.JInternalFrameFixture;
53
-import org.fest.swing.util.Platform;
54
 import org.junit.After;
47
 import org.junit.After;
55
 import org.junit.Before;
48
 import org.junit.Before;
56
 import org.junit.Ignore;
49
 import org.junit.Ignore;
57
 import org.junit.Test;
50
 import org.junit.Test;
58
 import org.junit.runner.RunWith;
51
 import org.junit.runner.RunWith;
59
 
52
 
60
-import static org.junit.Assert.*;
61
 
53
 
62
 @RunWith(UIClassTestRunner.class)
54
 @RunWith(UIClassTestRunner.class)
63
 public class InputTextFrameTest implements UITestIface {
55
 public class InputTextFrameTest implements UITestIface {

Loading…
取消
儲存