diff --git a/app/.classpath b/app/.classpath index 72c373710..62372c610 100644 --- a/app/.classpath +++ b/app/.classpath @@ -1,13 +1,13 @@ - + - + diff --git a/app/.settings/org.eclipse.jdt.core.prefs b/app/.settings/org.eclipse.jdt.core.prefs index 991033770..404e1da2b 100644 --- a/app/.settings/org.eclipse.jdt.core.prefs +++ b/app/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -64,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -93,7 +95,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/app/src/processing/app/syntax/JEditTextArea.java b/app/src/processing/app/syntax/JEditTextArea.java index c3e6c617c..43b8ad5f7 100644 --- a/app/src/processing/app/syntax/JEditTextArea.java +++ b/app/src/processing/app/syntax/JEditTextArea.java @@ -1336,12 +1336,12 @@ public class JEditTextArea extends JComponent * @param startOffset The offset to apply before the text will be drawn. * @return The width of the input segment in pixels with fractional character widths considered. */ - private int getTabbedTextWidth(Segment s, FontMetrics metrics, float x, TabExpander expander, - int startOffset) { + private int getTabbedTextWidth(Segment s, FontMetrics metrics, float x, + TabExpander expander, int startOffset) { + float additionalOffset = + getPartialPixelWidth(metrics, x, expander, startOffset) * s.length(); - float additionalOffset = getPartialPixelWidth(metrics, x, expander, startOffset) * s.length(); - - return (int) Math.round( + return Math.round( Utilities.getTabbedTextWidth(s, metrics, x, expander, startOffset) + additionalOffset ); } @@ -1369,14 +1369,9 @@ public class JEditTextArea extends JComponent // See https://github.com/sampottinger/processing/issues/103 // Requires reference not object equality check if (candidateMetrics != cachedPartialPixelWidthFont) { - float withFractional = Utilities.getTabbedTextWidth​( - TEST_SEGMENT, - candidateMetrics, - x, - expander, - startOffset - ); - + float withFractional = + Utilities.getTabbedTextWidth(TEST_SEGMENT, candidateMetrics, + x, expander, startOffset); int withoutFractional = (int) withFractional; partialPixelWidth = withFractional - withoutFractional; diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java index 0e9ab769e..811b25452 100644 --- a/app/src/processing/app/ui/Editor.java +++ b/app/src/processing/app/ui/Editor.java @@ -459,7 +459,6 @@ public abstract class Editor extends JFrame implements RunnerListener { return !sketch.isReadOnly(); } - @SuppressWarnings("unchecked") public boolean importData(TransferHandler.TransferSupport support) { int successful = 0;