diff --git a/core.output2/test/unit/src/org/netbeans/core/output2/WrappedTextViewTest.java b/core.output2/test/unit/src/org/netbeans/core/output2/WrappedTextViewTest.java --- a/core.output2/test/unit/src/org/netbeans/core/output2/WrappedTextViewTest.java +++ b/core.output2/test/unit/src/org/netbeans/core/output2/WrappedTextViewTest.java @@ -93,7 +93,7 @@ public class WrappedTextViewTest extends sleep(); for (int i=0; i < 100; i++) { - if (i == 42) { + if (i == Utilities.ANSWER_TO_LIFE_UNIVERSE_AND_EVERYTHING) { io.getOut().println ("This is a hyperlink to click which may or may not trigger the problem", new L()); } if (i % 2 == 0) { diff --git a/core.startup/test/unit/src/org/netbeans/core/startup/jars/library-src/pkg/subpkg/Something.java b/core.startup/test/unit/src/org/netbeans/core/startup/jars/library-src/pkg/subpkg/Something.java --- a/core.startup/test/unit/src/org/netbeans/core/startup/jars/library-src/pkg/subpkg/Something.java +++ b/core.startup/test/unit/src/org/netbeans/core/startup/jars/library-src/pkg/subpkg/Something.java @@ -40,5 +40,6 @@ */ package pkg.subpkg; public class Something { + // XXX modify to use o.o.util.Utilities.ANSWER_TO_LIFE_UNIVERSE_AND_EVERYTHING. protected static final int answer = 42; } diff --git a/java.api.common/nbproject/project.xml b/java.api.common/nbproject/project.xml --- a/java.api.common/nbproject/project.xml +++ b/java.api.common/nbproject/project.xml @@ -121,7 +121,7 @@ - 7.11 + 7.13 diff --git a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupport.java b/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupport.java --- a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupport.java +++ b/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupport.java @@ -60,6 +60,7 @@ import org.netbeans.spi.project.support. import org.netbeans.spi.project.support.ant.ReferenceHelper; import org.openide.filesystems.FileUtil; import org.openide.util.Parameters; +import org.openide.util.Utilities; /** * @@ -397,7 +398,7 @@ public final class ClassPathSupport { int hash = getType().ordinal(); if (this.broken) { - return 42; + return Utilities.ANSWER_TO_LIFE_UNIVERSE_AND_EVERYTHING; } switch (getType()) { diff --git a/refactoring.java/nbproject/project.xml b/refactoring.java/nbproject/project.xml --- a/refactoring.java/nbproject/project.xml +++ b/refactoring.java/nbproject/project.xml @@ -203,7 +203,9 @@ org.openide.util - + + 7.13 + org.openide.windows diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PullUpPanel.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PullUpPanel.java --- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PullUpPanel.java +++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PullUpPanel.java @@ -82,6 +82,7 @@ import org.netbeans.modules.refactoring. import org.netbeans.modules.refactoring.java.api.PullUpRefactoring; import org.netbeans.modules.refactoring.spi.ui.CustomRefactoringPanel; import org.openide.util.NbBundle; +import org.openide.util.Utilities; import org.openide.util.lookup.Lookups; @@ -120,7 +121,7 @@ public class PullUpPanel extends JPanel this.tableModel = new TableModel(); this.selectedMembers = selectedMembers; initComponents(); - setPreferredSize(new Dimension(420, 380)); + setPreferredSize(new Dimension(Utilities.ANSWER_TO_LIFE_UNIVERSE_AND_EVERYTHING * 10, 380)); membersTable.getModel().addTableModelListener(new TableModelListener() { public void tableChanged(TableModelEvent e) { parent.stateChanged(null);