This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 184269 - [regression] diff box in editor is not visible
Summary: [regression] diff box in editor is not visible
Status: VERIFIED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Code (show other bugs)
Version: 6.x
Hardware: PC Solaris
: P1 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords: REGRESSION
: 184362 (view as bug list)
Depends on:
Blocks:
 
Reported: 2010-04-15 12:13 UTC by Vladimir Voskresensky
Modified: 2010-04-21 04:38 UTC (History)
2 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Diff box with disabled linewrap in editor (21.79 KB, image/png)
2010-04-15 12:13 UTC, Vladimir Voskresensky 		Details
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Vladimir Voskresensky 2010-04-15 12:13:52 UTC 
Created attachment 97442 [details]
Diff box with disabled linewrap in editor

When I disable linewrap in editor => Diff box in editor has very small size and it's impossible to see the content.

If I enable linewrap in editor => Diff view has normal size
Comment 1 Marian Mirilovic 2010-04-15 12:19:08 UTC 
serious regression visible also in NB 6.9 Beta 20100415
Comment 2 Ondrej Vrabec 2010-04-15 12:55:07 UTC 
I can't reproduce with NetBeans IDE Dev (Build 100412-5cf8ea4d1a84), however it's reproducible in 6.9 Beta

So, Vladimir, could you specify the build you're using?
Comment 3 Vladimir Voskresensky 2010-04-15 13:03:41 UTC 
Ondrej, I use todays dev build (Build 100415-0dcdb61c442b)
BUT started with
-J-Dorg.netbeans.editor.linewrap.disable=true  -J-Dorg.netbeans.editor.linewrap=false

(it works correctly when linewrap in on, but editor is unusable in that case...)
Comment 4 Ondrej Vrabec 2010-04-15 13:14:52 UTC 
I see, i tried only with -J-Dorg.netbeans.editor.linewrap.disable=true.
Comment 5 Ondrej Vrabec 2010-04-16 09:06:51 UTC 
fix: http://hg.netbeans.org/cdev/rev/62996bdf75db
Comment 6 Quality Engineering 2010-04-17 08:21:06 UTC 
Integrated into 'main-golden', will be available in build *201004170515* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main/rev/62996bdf75db
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: Issue #184269 - [regression] diff box in editor is not visible
Comment 7 Jaromir Uhrik 2010-04-19 07:44:28 UTC 
Verified in the trunk build below. Please integrate the fix to the 6.9 Beta clone.

Product Version: NetBeans IDE Dev (Build 201004190200)
Java: 1.6.0_17; Java HotSpot(TM) 64-Bit Server VM 14.3-b01-101
System: Mac OS X version 10.5.8 running on x86_64; MacRoman; en_US (nb)
Comment 8 David Strupl 2010-04-19 08:58:13 UTC 
*** Bug 184362 has been marked as a duplicate of this bug. ***
Comment 9 Ondrej Vrabec 2010-04-19 10:43:30 UTC 
fix integrated into beta as http://hg.netbeans.org/release69_beta/rev/ad23e7b51239
Comment 10 Jaromir Uhrik 2010-04-21 04:38:25 UTC 
Verified in the following 6.9Beta build:
Product Version: NetBeans IDE 6.9 Beta (Build 201004200117)
Java: 1.6.0_17; Java HotSpot(TM) 64-Bit Server VM 14.3-b01-101
System: Mac OS X version 10.5.8 running on x86_64; MacRoman; en_US (nb)