<nb> public class TypeCheck implements NodeTraversal . Callback , CompilerPass {
 return false ;
 }

 + SINGLE
 + if ( NodeUtil . isForIn ( parent ) && parent . getFirstChild ( ) == n ) {
 + return false ;
 + }
 +
 JSType type = n . getJSType ( ) ;
 if ( type == null ) {
 type = getNativeType ( UNKNOWN_TYPE ) ;
 <nb> public class TypeCheckTest extends CompilerTypeTestCase {
 STRING0 ) ;
 }

 + public void testUnknownForIn ( ) throws Exception {
 + compiler . getOptions ( ) . setWarningLevel ( DiagnosticGroups . REPORT_UNKNOWN_TYPES ,
 + CheckLevel . WARNING ) ;
 + testTypes ( STRING1 ) ;
 + }
 +
 public void testUnknownTypeDisabledByDefault ( ) throws Exception {
 testTypes ( STRING2 ) ;
 }


<nb> public class PatternMatcher
 return matcher ;
 }

 + public Iterable < PatternMatch > match ( PatternNode start ,
 + Node startNode )
 + {
 + return match ( start , startNode , null ) ;
 + }
 +
 public Iterable < PatternMatch > match ( PatternNode start ,
 Node startNode , Map < String , PatternNode > objectVariables )
 {

Added a method for backwards compatibility


<nb> public class AggregatorTest extends ContextTestSupport {
 protected RouteBuilder createRouteBuilder ( ) {
 return new RouteBuilder ( ) {
 public void configure ( ) {
 + SINGLE
 + SINGLE
 +
 SINGLE
 + SINGLE
 from ( STRING0 ) . aggregator ( header ( STRING1 ) ) . to ( STRING2 ) ;

 - SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 from ( STRING3 ) . setHeader ( STRING4 , constant ( true ) ) . to ( STRING5 ) ;
 -
 + SINGLE
 from ( STRING5 ) . aggregator ( header ( STRING1 ) ) . to ( STRING2 ) ;

 + SINGLE
 + SINGLE
 from ( STRING6 ) . aggregator ( header ( STRING1 ) , new MyAggregationStrategy ( ) ) .
 completedPredicate ( header ( STRING7 ) . isEqualTo ( NUMBER0 ) ) . to ( STRING2 ) ;
 SINGLE

Added better wiki documentation for aggregator


<nb> public class LayoutManager extends RecyclerView . LayoutManager {
 }

 private void attachHeaderForStart ( View header , SectionData sd , LayoutState state ) {
 - if ( state . getCachedView ( sd . firstPosition ) != null ) {
 + if ( state . getCachedView ( sd . firstPosition ) != null && getDecoratedBottom ( header ) > NUMBER0 ) {
 addView ( header , findLastIndexForSection ( sd . firstPosition ) + NUMBER1 ) ;
 state . decacheView ( sd . firstPosition ) ;
 SINGLE


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - SINGLE
 - SINGLE
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

Removed one remaining comment in the imports


<nb> public class KernelUidCpuTimeReader {
 powerMaUs = NUMBER0 ;
 }

 - if ( callback != null ) {
 + SINGLE
 + if ( callback != null && mLastTimeReadUs != NUMBER0 ) {
 long userTimeDeltaUs = userTimeUs ;
 long systemTimeDeltaUs = systemTimeUs ;
 long powerDeltaMaUs = powerMaUs ;

Consume the first sample of KernelUidCpuTimeReader


<nb> public class BackupDelete extends BaseActivity {
 . putBoolean ( SeriesGuidePreferences . KEY_DATABASEIMPORTED , true ) . commit ( ) ;
 getContentResolver ( ) . notifyChange ( Shows . CONTENT_URI , null ) ;

 + SINGLE
 + try {
 + Thread . sleep ( NUMBER0 ) ;
 + } catch ( InterruptedException e ) {
 + e . printStackTrace ( ) ;
 + }
 +
 SINGLE
 SINGLE
 final Cursor shows = getContentResolver ( ) . query ( Shows . CONTENT_URI , new String [ ] {

Wait a little after the database was imported before we check if the


<nb> public class ReaderPostDetailFragment extends Fragment
 }
 }

 - @ override
 - public void onPause ( ) {
 - super . onPause ( ) ;
 -
 - SINGLE
 - SINGLE
 - pauseWebView ( ) ;
 - }
 -
 - @ override
 - public void onResume ( ) {
 - super . onResume ( ) ;
 -
 - SINGLE
 - resumeWebViewIfPaused ( ) ;
 - }
 -
 COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 + COMMENT
 private void togglePostLike ( ) {
 if ( ! isAdded ( ) || ! hasPost ( ) || ! NetworkUtils . checkConnection ( getActivity ( ) ) ) {
 return ;

Removed pausing resuming of webView from the fragment no longer necessary


<nb>
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 package NAMESPACE ;

 import NAMESPACE ;


<nb> public class SettingsFragment extends PreferenceFragment {

 SharedPreferences prefs = PreferenceManager . getDefaultSharedPreferences ( getActivity ( ) ) ;
 if ( prefs . getBoolean ( STRING0 , true ) ) {
 - MainApplication . openLink ( getActivity ( ) , STRING1 , false ) ;
 + MainApplication . openLink ( getActivity ( ) , STRING1 , false ) ;
 + SINGLE
 }
 }


<nb> public class Node implements Serializable {
 child . parent = null ;
 }

 + COMMENT
 + public void replaceFirstOrChildAfter ( @ nullable Node prev , Node newChild ) {
 + if ( prev == null ) {
 + replaceChild ( getFirstChild ( ) , newChild ) ;
 + } else {
 + replaceChildAfter ( prev , newChild ) ;
 + }
 + }
 +
 @ visiblefortesting
 PropListItem lookupProperty ( int propType ) {
 PropListItem x = propListHead ;


<nb> class ZooKeeperHiveClientHelper {
 SINGLE
 if ( ( matcher . group ( NUMBER0 ) . equals ( STRING0 ) )
 && ! ( connParams . getSessionVars ( ) . containsKey ( JdbcConnectionParams . HTTP_PATH ) ) ) {
 - connParams . getSessionVars ( ) . put ( JdbcConnectionParams . HTTP_PATH , STRING1 + matcher . group ( NUMBER1 ) ) ;
 + connParams . getSessionVars ( ) . put ( JdbcConnectionParams . HTTP_PATH , matcher . group ( NUMBER1 ) ) ;
 }
 SINGLE
 if ( ( matcher . group ( NUMBER0 ) != null ) && ( matcher . group ( NUMBER0 ) . equals ( STRING2 ) )

JDBC Driver appends an extra when configuring connection by reading httpPath from ZooKeeper Vaibhav Gumashta reviewed by Thejas Nair


<nb> import NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - public interface IItemAdapter {
 + public interface IItemAdapter extends IAdapter {

 COMMENT
 COMMENT

the IItemAdapter implements the IAdapter interface


<nb> public class ViewPager extends ViewGroup {
 }
 completeScroll ( false ) ;
 scrollTo ( destX , NUMBER0 ) ;
 + pageScrolled ( destX ) ;
 }
 }

ViewPager was not repositioning the PagerTitleStrip properly


<nb> class MyClass {
 return super . clone ( ) ;
 }

 + @ notnull
 @ override
 public String toString ( ) {
 return super . toString ( ) ;
 <nb> class A {
 return super . clone ( ) ;
 }

 + @ notnull
 @ override
 public String toString ( ) {
 return super . toString ( ) ;
 <nb> class Test {
 return s ;
 }

 + @ notnull
 String foo4 ( @ notnull String s ) {
 return s . substring ( NUMBER0 ) ;
 }
 <nb> class MyClass < T > implements A < T > {
 return super . clone ( ) ;
 }

 + @ notnull
 @ override
 public String toString ( ) {
 return super . toString ( ) ;

adapt testdata to inferred jdk annotations


<nb> public class Word2Vec implements Persistable {
 }

 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + public void resetWeightsOnSetup ( ) {
 + this . shouldReset = true ;
 + }
 +

 public int getLayerSize ( ) {

allow to reset weights for new sentence iterator


<nb>
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 +
 package NAMESPACE ;

 import NAMESPACE ;
 <nb>
 package NAMESPACE ;

 import NAMESPACE ;
 - import NAMESPACE ;
 - import NAMESPACE ;

 COMMENT
 COMMENT

HivePairFlatMapFunction java missing license header Spark Branch Chao via Xuefu


<nb> public class Upload extends ConventionTask {
 COMMENT
 COMMENT
 COMMENT
 - @ optional @ outputfile
 + @ internal
 public File getDescriptorDestination ( ) {
 return descriptorDestination ;
 }

Make Upload descriptorDestination internal


<nb> import NAMESPACE ;
 public class LwjglApplicationConfiguration {
 COMMENT
 COMMENT
 - static public final boolean disableAudio = true ;
 + static public boolean disableAudio ;

 COMMENT
 public boolean useGL20 = false ;


<nb> public class BuildDataManager implements StorageOwner {
 }
 }
 }
 + saveVersion ( ) ;
 }

 public void flush ( boolean memoryCachesOnly ) {

save storage format version after successful cleanup


<nb> public class MBeanInfoAssemblerTest {
 ModelMBeanInfo beanInfo = mbeanInfoAssembler . getMBeanInfo ( new BadInherited ( ) , null , STRING0 ) ;
 assertNotNull ( beanInfo ) ;
 assertNotNull ( beanInfo . getAttributes ( ) ) ;
 - assertEquals ( NUMBER0 , beanInfo . getAttributes ( ) . length ) ;
 + assertEquals ( NUMBER1 , beanInfo . getAttributes ( ) . length ) ;
 assertNotNull ( beanInfo . getOperations ( ) ) ;
 - assertEquals ( NUMBER0 , beanInfo . getOperations ( ) . length ) ;
 + assertEquals ( NUMBER2 , beanInfo . getOperations ( ) . length ) ;

 }


<nb>
 package NAMESPACE ;

 - import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 + import static NAMESPACE ;
 +
 COMMENT
 COMMENT
 COMMENT
 <nb> public class Duration {

 @ override public int hashCode ( )
 {
 - return Objects . hash ( toNanos ( ) , TimeUnit . NANOSECONDS ) ;
 + return Arrays . hashCode ( new Object [ ] { toNanos ( ) , NANOSECONDS } ) ;
 }
 -
 +
 @ override public String toString ( )
 {
 return STRING0 + STRING1 + length + STRING2 + timeUnit + STRING3 ;

Add Duration equals toString hashCode some simple tests for same


<nb> public class ConstantConditionalExpressionInspection
 assert thenExpression != null ;
 assert elseExpression != null ;

 - if ( isFalse ( condition ) && isTrue ( elseExpression ) ) {
 + if ( isTrue ( condition ) ) {
 return thenExpression . getText ( ) ;
 } else {
 return elseExpression . getText ( ) ;


<nb> class SmartPsiElementPointerImpl < E extends PsiElement > implements SmartPointerEx
 if ( myElement instanceof PsiImportList ) {
 return new ImportListInfo ( ( PsiJavaFile ) myElement . getContainingFile ( ) ) ;
 }
 - LOG . assertTrue ( myElement . isPhysical ( ) , STRING0 + myElement ) ;
 +
 + if ( ! myElement . isPhysical ( ) ) return null ;
 +
 PsiElement anchor = getAnchor ( myElement ) ;
 if ( anchor != null ) {
 return new AnchorElementInfo ( anchor ) ;

Replace assertion with reasonable fallback


<nb> public class TextEditingTarget implements
 SINGLE
 docDisplay_ . getScopeTree ( ) ;

 - executeSweaveChunk ( scopeHelper_ . getNextSweaveChunk ( ) , true ) ;
 + Scope nextChunk = scopeHelper_ . getNextSweaveChunk ( ) ;
 + executeSweaveChunk ( nextChunk , true ) ;
 + docDisplay_ . setCursorPosition ( nextChunk . getBodyStart ( ) ) ;
 + docDisplay_ . ensureCursorVisible ( ) ;
 }

 @ handler

executeNextChunk moves cursor to start of next chunk


<nb> public COMMENT class LogFactory {
 COMMENT
 COMMENT
 public String [ ] getAttributeNames ( ) {
 - return ( String [ ] ) logConfig . keySet ( ) . toArray ( ) ;
 + String result [ ] = new String [ logConfig . size ( ) ] ;
 + return logConfig . keySet ( ) . toArray ( result ) ;
 }

 COMMENT


<nb> public class OsgiTypeConverter extends ServiceSupport implements TypeConverter ,
 return getDelegate ( ) . getInjector ( ) ;
 }

 + public Statistics getStatistics ( ) {
 + return getDelegate ( ) . getStatistics ( ) ;
 + }
 +
 public synchronized DefaultTypeConverter getDelegate ( ) {
 if ( delegate == null ) {
 delegate = createRegistry ( ) ;
 <nb> public class MockTypeConverterRegistry implements TypeConverterRegistry {
 return null ;
 }

 + public Statistics getStatistics ( ) {
 + return null ;
 + }
 +
 + public void start ( ) throws Exception {
 + SINGLE
 + }
 +
 + public void stop ( ) throws Exception {
 + SINGLE
 + }
 }

Added utilization stats to type converter registry which is also accessible from JMX


<nb>
 package NAMESPACE ;

 import NAMESPACE ;
 + import NAMESPACE ;
 + import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class AvailablePluginsManagerMain extends PluginManagerMain {
 installed . modifyPluginsList ( list ) ; SINGLE
 }

 + @ override
 + protected DefaultActionGroup createSortersGroup ( ) {
 + final DefaultActionGroup group = super . createSortersGroup ( ) ;
 + group . addAction ( new SortByDownloadsAction ( pluginTable , pluginsModel ) ) ;
 + group . addAction ( new SortByRatingAction ( pluginTable , pluginsModel ) ) ;
 + group . addAction ( new SortByUpdatedAction ( pluginTable , pluginsModel ) ) ;
 + return group ;
 + }
 +
 private class MyFilterCategoryAction extends ComboBoxAction implements DumbAware {
 @ override
 public void update ( AnActionEvent e ) {

register all sorters for available plugins table


<nb> public class VoldemortConfig implements Serializable {
 this . socketBufferSize = ( int ) props . getBytes ( STRING0 , NUMBER0 * NUMBER1 ) ;
 this . socketKeepAlive = props . getBoolean ( STRING1 , false ) ;

 - this . useNioConnector = props . getBoolean ( STRING2 , false ) ;
 + this . useNioConnector = props . getBoolean ( STRING2 , true ) ;
 this . nioConnectorSelectors = props . getInt ( STRING3 ,
 Math . max ( NUMBER2 , Runtime . getRuntime ( )
 . availableProcessors ( ) ) ) ;

Changing the enable nio connector to true by default


<nb> public class UDFJson extends UDF {
 COMMENT
 public Text evaluate ( String jsonString , String pathString ) {

 - if ( jsonString == null || jsonString == STRING0 || pathString == null
 - || pathString == STRING0 ) {
 + if ( jsonString == null || jsonString . isEmpty ( ) || pathString == null
 + || pathString . isEmpty ( ) ) {
 return null ;
 }

UDFJson uses the operator to compare Strings Alexander Pivavorov via Jason Dere


<nb> public class WriteConcern implements Serializable {
 COMMENT
 COMMENT
 COMMENT
 + @ deprecated
 public void setWObject ( Object w ) {
 if ( ! ( w instanceof Integer ) && ! ( w instanceof String ) )
 throw new IllegalArgumentException ( STRING0 ) ;

Added Deprecated annotation to method with deprecated Javadoc tag


<nb> public class SmartTabLayout extends HorizontalScrollView {
 super . onSizeChanged ( w , h , oldw , oldh ) ;
 if ( tabStrip . isIndicatorAlwaysInCenter ( ) && tabStrip . getChildCount ( ) > NUMBER0 ) {
 View firstTab = tabStrip . getChildAt ( NUMBER0 ) ;
 - View lastTab = tabStrip . getChildAt ( getChildCount ( ) - NUMBER1 ) ;
 + View lastTab = tabStrip . getChildAt ( tabStrip . getChildCount ( ) - NUMBER1 ) ;
 int start = ( w - Utils . getMeasuredWidth ( firstTab ) ) / NUMBER2 - Utils . getMarginStart ( firstTab ) ;
 int end = ( w - Utils . getMeasuredWidth ( lastTab ) ) / NUMBER2 - Utils . getMarginEnd ( lastTab ) ;
 tabStrip . setMinimumWidth ( tabStrip . getMeasuredWidth ( ) ) ;

Fixed issue with center last item in always in center tablayout


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class HttpBinding extends AbstractActiveBinding < HttpBindingProvider > impl
 return OnOffType . valueOf ( transformedResponse ) ;
 } else if ( itemType . isAssignableFrom ( RollershutterItem . class ) ) {
 return PercentType . valueOf ( transformedResponse ) ;
 + } else if ( itemType . isAssignableFrom ( DateTimeItem . class ) ) {
 + return DateTimeType . valueOf ( transformedResponse ) ;
 } else {
 return StringType . valueOf ( transformedResponse ) ;
 }


<nb> public class TestServlet extends HttpServlet {
 . request ( )
 . post ( Entity . text ( STRING0 ) , String . class ) ;
 out . println ( STRING1 + fruit ) ;
 -
 - out . println ( STRING2 ) ;
 out . println ( STRING3 ) ;
 out . println ( STRING4 ) ;
 }


<nb> public class WPOptimizelyEventListener implements OptimizelyEventListener {
 HashMap < String , String > abTestProperties = new HashMap < > ( ) ;
 abTestProperties . put ( ABTEST_NAME , experiment . experimentName ) ;
 abTestProperties . put ( ABTEST_VARIATION , experiment . variationName ) ;
 - AnalyticsTracker . track ( AnalyticsTracker . Stat . ABTEST_START ) ;
 + AnalyticsTracker . track ( AnalyticsTracker . Stat . ABTEST_START , abTestProperties ) ;
 }
 }


<nb> public class JavaFileStructureFilteringTest extends JavaFileStructureTestCase {
 public void testSelectLeafFirst3 ( ) throws Exception { checkTree ( STRING0 ) ; }
 public void testSelectLeafFirst4 ( ) throws Exception { checkTree ( STRING0 ) ; }

 - @ bombed ( user = STRING1 , month = Calendar . JULY , day = NUMBER0 )
 public void testMatcher ( ) throws Exception { checkTree ( STRING2 ) ; }
 +
 @ bombed ( user = STRING1 , month = Calendar . AUGUST , day = NUMBER1 )
 public void testMatcher1 ( ) throws Exception { checkTree ( STRING3 ) ; }
 @ bombed ( user = STRING1 , month = Calendar . AUGUST , day = NUMBER1 )
 <nb> public class SpeedSearchComparator {
 }

 public int matchingDegree ( String pattern , String text ) {
 - return obtainMatcher ( pattern ) . matchingDegree ( text ) ;
 + MinusculeMatcher matcher = obtainMatcher ( pattern ) ;
 + return matcher . matchingDegree ( text ) + ( matcher . isStartMatch ( text ) ? NUMBER2 : NUMBER3 ) ;
 }

 @ nullable


<nb> public class DashUpdatesFragment extends DashBaseFragment {
 SINGLE
 if ( ! updateOnlyProgress ) {
 getProgressIfPossible ( basicProgressAsyncTask . getDescription ( ) ) ;
 - if ( currentProgress == null ) {
 - return ;
 - }
 + }
 +
 + if ( currentProgress == null ) {
 + return ;
 }

 if ( updateOnlyProgress ) {


<nb> public class RemoteImService extends Service implements OtrEngineListener , ImSer
 private void startForegroundCompat ( ) {
 Notification notification = new Notification ( R . drawable . notify_chatsecure , getString ( R . string . app_name ) ,
 System . currentTimeMillis ( ) ) ;
 - Intent notificationIntent = new Intent ( this , NewChatActivity . class ) ;
 - notificationIntent . setFlags ( Intent . FLAG_ACTIVITY_CLEAR_TOP ) ;
 + Intent notificationIntent = new Intent ( this , NewChatActivity . class ) ;
 PendingIntent launchIntent = PendingIntent . getActivity ( getApplicationContext ( ) , NUMBER0 , notificationIntent , NUMBER0 ) ;
 notification . setLatestEventInfo ( getApplicationContext ( ) ,
 getString ( R . string . app_name ) ,
 getString ( R . string . app_unlocked ) ,
 launchIntent ) ;

 - SINGLE
 startForeground ( NUMBER1 , notification ) ;
 }

don t cleartop when notification is tapped to launch app


<nb> public class Preferences extends PreferenceActivity {
 public void onClick ( DialogInterface arg0 , int arg1 ) {
 Intent i = new Intent ( Intent . ACTION_VIEW ) ;
 i . setData ( Uri
 - . parse ( STRING0 ) ) ;
 + . parse ( STRING1 ) ) ;
 startActivity ( i ) ;
 }
 } ) ;


<nb> public class RobotiumUtils {
 } catch ( PatternSyntaxException e ) {
 pattern = Pattern . compile ( regex , Pattern . LITERAL ) ;
 }
 - Matcher matcher = pattern . matcher ( view . getText ( ) . toString ( ) ) ;
 + String viewText = view . getText ( ) . toString ( ) ;
 + viewText = viewText . replaceAll ( STRING0 , STRING1 ) ;
 + Matcher matcher = pattern . matcher ( viewText ) ;
 +
 if ( matcher . find ( ) ) {
 uniqueTextViews . add ( view ) ;
 }


<nb> public class DefaultTypeConverter implements TypeConverter , TypeConverterRegistr
 }
 }

 - if ( LOG . isDebugEnabled ( ) ) {
 - LOG . debug ( STRING0
 - + ( value == null ? STRING1 : value . getClass ( ) . getCanonicalName ( ) )
 - + STRING2 + type . getCanonicalName ( ) + STRING3 + value ) ;
 + boolean camelType = type . getCanonicalName ( ) . startsWith ( STRING4 ) ;
 + if ( ! camelType && value != null ) {
 + SINGLE
 + LOG . warn ( STRING0
 + + value . getClass ( ) . getCanonicalName ( ) + STRING2
 + + type . getCanonicalName ( ) + STRING3 + value ) ;
 }
 return null ;
 }

Changed to WARN log for non internal camel convertions


<nb> public class LazyTagLibraryLookup extends TagLibraryLookup {
 bd . setAutowireMode ( AbstractBeanDefinition . AUTOWIRE_BY_NAME ) ;
 ( ( GenericApplicationContext ) applicationContext ) . getDefaultListableBeanFactory ( ) . registerBeanDefinition ( tagLibraryClassName , bd ) ;
 resolveTagLibraries . put ( tagKey , tagLib . getFullName ( ) ) ;
 - return ( GroovyObject ) applicationContext . getBean ( tagLibraryClassName ) ;
 + return applicationContext . getBean ( tagLibraryClassName , GroovyObject . class ) ;
 }
 + } else {
 + resolveTagLibraries . put ( tagKey , tagLib . getFullName ( ) ) ;
 + return applicationContext . getBean ( tagLibraryClassName , GroovyObject . class ) ;
 }
 }
 }

fix bug in LazyTagLibraryLookup when taglib bean already exists in context


<nb> public class ContextMenuLayer extends OsmandMapLayer {

 } else if ( showUnknownLocation ) {
 hideVisibleMenues ( ) ;
 + selectedObjectContextMenuProvider = null ;
 LatLon latLon = getLatLon ( point , tileBox ) ;
 activity . getMapViewTrackingUtilities ( ) . setMapLinkedToLocation ( false ) ;
 menu . show ( latLon , null , null ) ;


<nb> public class JpsGantProjectBuilder {

 private void runBuild ( final Set < String > modulesSet , final boolean allModules , boolean includeTests ) {
 if ( ! myDryRun ) {
 - info ( STRING0 )
 + info ( STRING0 ) ;
 final AntMessageHandler messageHandler = new AntMessageHandler ( ) ;
 SINGLE
 AntLoggerFactory . ourMessageHandler = new AntMessageHandler ( ) ;
 <nb> public class JpsGantProjectBuilder {
 myBuildInfoPrinter . printStatisticsMessage ( this , STRING1 , String . valueOf ( System . currentTimeMillis ( ) - compilationStart ) ) ;
 myStatisticsReported = true ;
 }
 - info ( STRING2 )
 + info ( STRING2 ) ;
 }
 else {
 info ( STRING3 ) ;


<nb> public class MessageParser extends AbstractParser implements
 Conversation conversation = mXmppConnectionService . findOrCreateConversation ( account , counterpart . toBareJid ( ) , isTypeGroupChat ) ;
 if ( isTypeGroupChat ) {
 if ( counterpart . getResourcepart ( ) . equals ( conversation . getMucOptions ( ) . getActualNick ( ) ) ) {
 - status = Message . STATUS_SEND ;
 - if ( mXmppConnectionService . markMessage ( conversation , remoteMsgId , Message . STATUS_SEND_RECEIVED ) ) {
 + status = Message . STATUS_SEND_RECEIVED ;
 + if ( mXmppConnectionService . markMessage ( conversation , remoteMsgId , status ) ) {
 return ;
 } else {
 Message message = conversation . findSentMessageWithBody ( body ) ;
 if ( message != null ) {
 message . setRemoteMsgId ( remoteMsgId ) ;
 - mXmppConnectionService . markMessage ( message , Message . STATUS_SEND_RECEIVED ) ;
 + mXmppConnectionService . markMessage ( message , status ) ;
 return ;
 }
 }

fixed more edge cases in muc message parser


<nb>
 COMMENT
 package NAMESPACE ;

 - import NAMESPACE ;
 import NAMESPACE ;

 - public class ScopeFunction extends JavaScriptObject
 + public class ScopeFunction extends Scope
 {
 protected ScopeFunction ( )
 { }


<nb> public class ResponseConsumerDelegate extends AbstractAsyncResponseConsumer < Http

 @ override
 protected void releaseResources ( ) {
 - consumer . _releaseResources ( ) ;
 + if ( consumer != null ) {
 + consumer . _releaseResources ( ) ;
 + }
 }

 }

Fixed NullPointerException that may happen on timeout


<nb> import NAMESPACE ;
 COMMENT
 public final class YarnUtils {
 private static final NodeState [ ] USABLE_NODE_STATES ;
 +
 static {
 List < NodeState > usableStates = Lists . newArrayList ( ) ;
 for ( NodeState nodeState : NodeState . values ( ) ) {
 <nb> public class ApplicationMasterTest {
 private ArgumentMatcher < ContainerRequest > getMasterContainerMatcher ( ) {
 return new ArgumentMatcher < ContainerRequest > ( ) {
 public boolean matches ( Object arg ) {
 - boolean require_locality = MASTER_ADDRESS . equals ( STRING0 ) ;
 + boolean requireLocality = MASTER_ADDRESS . equals ( STRING0 ) ;
 ContainerRequest expectedWorkerContainerRequest =
 new ContainerRequest ( Resource . newInstance ( MASTER_MEM_MB , MASTER_CPU ) ,
 - new String [ ] { MASTER_ADDRESS } , null , Priority . newInstance ( NUMBER0 ) , require_locality ) ;
 + new String [ ] { MASTER_ADDRESS } , null , Priority . newInstance ( NUMBER0 ) , requireLocality ) ;
 return EqualsBuilder . reflectionEquals ( arg , expectedWorkerContainerRequest ) ;
 }
 } ;


<nb> public class IndexingService extends LifecycleAdapter
 public void activateIndex ( long indexId ) throws
 IndexNotFoundKernelException , IndexActivationFailedKernelException , IndexPopulationFailedKernelException
 {
 - IndexProxy index = getProxyForRule ( indexId ) ;
 try
 {
 if ( state == State . RUNNING ) SINGLE
 {
 + IndexProxy index = getProxyForRule ( indexId ) ;
 index . awaitStoreScanCompleted ( ) ;
 index . activate ( ) ;
 }
 <nb> public class IndexingServiceTest
 assertThat ( asCollection ( files ) , equalTo ( asCollection ( iterator ( theFile ) ) ) ) ;
 }

 + @ test
 + public void shouldIgnoreActivateCallDuringRecovery ( ) throws Exception
 + {
 + SINGLE
 + IndexingService indexingService = newIndexingServiceWithMockedDependencies ( populator , accessor , withData ( ) ) ;
 +
 + life . start ( ) ;
 +
 + SINGLE
 + indexingService . activateIndex ( NUMBER0 ) ;
 +
 + SINGLE
 + }
 +
 private Answer waitForLatch ( final CountDownLatch latch ) {
 return new Answer ( ) {
 @ override


<nb> package NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 - import NAMESPACE ;
 - import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 - public class InvalidateEntryProcessor implements EntryProcessor < String , Object > , DataSerializable {
 + public class InvalidateEntryProcessor extends AbstractEntryProcessor < String , Object > implements DataSerializable {
 private String sessionId ;

 SINGLE
 public InvalidateEntryProcessor ( ) {
 + super ( true ) ;
 }

 public InvalidateEntryProcessor ( String sessionId ) {
 <nb> public class InvalidateEntryProcessor implements EntryProcessor < String , Object > ,
 }

 @ override
 - public EntryBackupProcessor < String , Object > getBackupProcessor ( ) {
 - return null ;
 - }
 -
 - @ override
 public void writeData ( ObjectDataOutput out ) throws IOException {
 out . writeUTF ( sessionId ) ;
 }


<nb> public class GoApplicationRunningState extends GoRunningState {
 commandLine . setExePath ( executable ) ;
 commandLine . addParameter ( STRING0 ) ;
 commandLine . addParameter ( myConfiguration . getFilePath ( ) ) ;
 + commandLine . addParameter ( myConfiguration . getParams ( ) ) ;
 commandLine . setWorkDirectory ( myModule . getProject ( ) . getBasePath ( ) ) ;
 TextConsoleBuilder consoleBuilder = TextConsoleBuilderFactory . getInstance ( ) . createBuilder ( myModule . getProject ( ) ) ;
 setConsoleBuilder ( consoleBuilder ) ;


<nb> import NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> import NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public interface VerificationWithTimeout extends VerificationMode {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT

Fixed method name to verifyNoMoreInteractions


<nb> public class PrepRequestProcessor extends Thread implements RequestProcessor {
 nextProcessor . processRequest ( request ) ;
 }

 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 private boolean fixupACL ( ArrayList < Id > authInfo , ArrayList < ACL > acl ) {
 if ( skipACL ) {
 return true ;


<nb> public class AQUtility {
 }

 public static Context getContext ( ) {
 + if ( context == null ) {
 + AQUtility . warn ( STRING0 , STRING1 ) ;
 + }
 return context ;
 }
 }


<nb> class StudyBrowserWindow extends JFrame {
 template = template . replace ( STRING0 , getClass ( ) . getResource ( STRING1 ) . toExternalForm ( ) ) ;
 }
 template = template . replace ( STRING2 , configurator . getDefaultHighlightingMode ( ) ) ;
 - template = template . replace ( STRING3 , STRING4 +
 - STRING5 +
 - STRING6 +
 - STRING7 +
 - STRING8 +
 - STRING9 +
 - STRING10 +
 - STRING11 +
 - STRING12 +
 - STRING13 +
 - STRING11 +
 - STRING14 +
 - STRING15 +
 - STRING11 +
 - STRING16 +
 - STRING17 +
 - STRING18 ) ;
 + template = template . replace ( STRING3 , content ) ;

 return template ;
 }

Remove debug artifacts in study code highlighting


<nb> public class MongoClientURI {
 }

 COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + public MongoCredential getCredentials ( ) {
 + if ( proxied . getCredentialList ( ) . isEmpty ( ) ) {
 + return null ;
 + }
 + else {
 + return new MongoCredential ( proxied . getCredentialList ( ) . get ( NUMBER0 ) ) ;
 + }
 + }
 +
 + COMMENT
 COMMENT
 COMMENT
 COMMENT

Added MongoClientURI getCredentials in driver compat


<nb> public class WebXml {
 SINGLE
 SINGLE
 SINGLE
 - wrapper . setJspFile ( servlet . getJspFile ( ) ) ;
 + SINGLE
 + SINGLE
 + String jspFile = servlet . getJspFile ( ) ;
 + if ( jspFile != null ) {
 + wrapper . setJspFile ( jspFile ) ;
 + }
 if ( servlet . getLoadOnStartup ( ) != null ) {
 wrapper . setLoadOnStartup ( servlet . getLoadOnStartup ( ) . intValue ( ) ) ;
 }

Don t mark every servlet as the JSP Servlet


<nb> public class RibbonConfig {
 }

 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT


<nb> public class MaterialAutoCompleteTextView extends AutoCompleteTextView {
 invalidate ( ) ;
 }

 - public boolean getHelperTextAlwaysShown ( ) {
 + public boolean isHelperTextAlwaysShown ( ) {
 return helperTextAlwaysShown ;
 }

 <nb> public class MaterialEditText extends EditText {
 invalidate ( ) ;
 }

 - public boolean getHelperTextAlwaysShown ( ) {
 + public boolean isHelperTextAlwaysShown ( ) {
 return helperTextAlwaysShown ;
 }

 <nb> public class MaterialMultiAutoCompleteTextView extends MultiAutoCompleteTextView
 invalidate ( ) ;
 }

 - public boolean getHelperTextAlwaysShown ( ) {
 + public boolean isHelperTextAlwaysShown ( ) {
 return helperTextAlwaysShown ;
 }

Rename getHelperTextAlwaysShown to isHelperTextAlwaysShown


<nb> public class C0DChunk extends Chunk {
 @ override public int nextNZ ( int rid ) {
 return _con == NUMBER0 ? _len : rid + NUMBER1 ;
 }
 + @ override public boolean isSparse ( ) { return _con == NUMBER0 ; }
 }
 <nb> public class C0LChunk extends Chunk {
 @ override public int nextNZ ( int rid ) {
 return _con == NUMBER0 ? _len : rid + NUMBER1 ;
 }
 + @ override public boolean isSparse ( ) { return _con == NUMBER0 ; }
 }


<nb> public class PackageManagerService extends IPackageManager . Stub {
 == PackageManager . SIGNATURE_MATCH ) ;
 if ( ! allowed && ( bp . protectionLevel
 & PermissionInfo . PROTECTION_FLAG_SYSTEM ) != NUMBER0 ) {
 - if ( isPrivilegedApp ( pkg ) ) {
 + if ( isSystemApp ( pkg ) ) {
 SINGLE
 SINGLE
 if ( isUpdatedSystemApp ( pkg ) ) {
 <nb> public class PackageManagerService extends IPackageManager . Stub {
 . getDisabledSystemPkgLPr ( pkg . packageName ) ;
 final GrantedPermissions origGp = sysPs . sharedUser != null
 ? sysPs . sharedUser : sysPs ;
 +
 if ( origGp . grantedPermissions . contains ( perm ) ) {
 + SINGLE
 + SINGLE
 + SINGLE
 allowed = true ;
 } else {
 SINGLE
 <nb> public class PackageManagerService extends IPackageManager . Stub {
 }
 }
 } else {
 - allowed = true ;
 + allowed = isPrivilegedApp ( pkg ) ;
 }
 }
 }

Fix permission privilege w r t updated system apps


<nb> public class DisUnityProcessor implements Runnable {
 break ;
 }

 + SINGLE
 + File backupFile = new File ( sourceFile . getPath ( ) + STRING0 ) ;
 + FileUtils . copyFile ( sourceFile , backupFile ) ;
 +
 String fixedPath = sourceFile . getParent ( ) . replace ( STRING1 , STRING2 ) . toLowerCase ( ) ;

 for ( AssetRef ref : asset . getReferences ( ) ) {
 - if ( isAsset ( ref . filePath ) ) {
 + if ( isAsset ( ref . filePath ) && ref . filePath . endsWith ( STRING3 ) ) {
 String pathOld = ref . filePath ;
 ref . filePath = fixedPath + STRING2 + FilenameUtils . getName ( ref . filePath ) ;
 L . log ( Level . FINE , STRING4 , new Object [ ] { pathOld , ref . filePath } ) ;

create backup first and fix only files with the


<nb> public class AtmosphereFramework {
 try {
 Class < ? > c = Class . forName ( b ) ;
 return ( AtmosphereObjectFactory ) c . newInstance ( ) ;
 + } catch ( ClassNotFoundException e ) {
 + logger . trace ( e . getMessage ( ) + STRING0 ) ;
 } catch ( Exception e ) {
 logger . trace ( STRING1 , e ) ;
 }

Don t print stack trace when ObjectFactory isn t found


<nb> public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 public static List transpose ( List self ) {


<nb> public class EnglishGrammaticalRelations {
 PrepositionalObjectGRAnnotation . class , OBJECT , STRING0 , tregexCompiler ,
 new String [ ] {
 SINGLE
 - STRING1 ,
 + STRING2 ,
 SINGLE
 - STRING3 ,
 + STRING4 ,
 SINGLE
 SINGLE
 STRING5 ,
 <nb> public class EnglishGrammaticalRelations {

 STRING6 , SINGLE
 SINGLE
 - STRING7 , SINGLE
 + STRING8 , SINGLE
 SINGLE
 STRING9 ,
 SINGLE

When given is used as a preposition it should have a pobj


<nb> package NAMESPACE ;
 public interface MemoryAccessor {

 COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + boolean isBigEndian ( ) ;
 +
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> import NAMESPACE ;

 import NAMESPACE ;

 + import static NAMESPACE ;
 import static NAMESPACE ;
 import static NAMESPACE ;

 <nb> public final class StandardMemoryAccessor extends UnsafeBasedMemoryAccessor {
 }
 }

 + @ override
 + public boolean isBigEndian ( ) {
 + return IS_PLATFORM_BIG_ENDIAN ;
 + }

 SINGLE

 <nb> public class HeapMemoryManager implements MemoryManager {
 }

 @ override
 + public boolean isBigEndian ( ) {
 + return false ;
 + }
 +
 + @ override
 public boolean getBoolean ( long address ) {
 throw new UnsupportedOperationException ( ) ;
 }


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 <nb> public class ExtensionScanner extends ExtensionAdaptor implements ScannerListene
 }
 return popupMenuScanHistory ;
 }
 +
 + @ override
 + public void notifyNewMessage ( HttpMessage msg ) {
 + SINGLE
 + }

 }

Added pause and resume and notification of new messages


<nb> public interface JavaCodeFragment extends PsiImportHolder , PsiCodeFragment {
 public Visibility isDeclarationVisible ( PsiElement declaration , PsiElement place ) {
 return Visibility . VISIBLE ;
 }
 +
 + @ override
 + public String toString ( ) {
 + return STRING0 ;
 + }
 } ;

 VisibilityChecker PROJECT_SCOPE_VISIBLE = new VisibilityChecker ( ) {
 <nb> public interface JavaCodeFragment extends PsiImportHolder , PsiCodeFragment {
 public Visibility isDeclarationVisible ( PsiElement declaration , PsiElement place ) {
 return declaration . getManager ( ) . isInProject ( declaration ) ? Visibility . VISIBLE : Visibility . NOT_VISIBLE ;
 }
 +
 + @ override
 + public String toString ( ) {
 + return STRING1 ;
 + }
 } ;
 }

toString impls for builtin visibility checkers


<nb> public class PsiTreeUtil {
 return result ;
 }

 - private static boolean instanceOf ( final PsiElement child , final Class < ? > . . . classes ) {
 + public static boolean instanceOf ( final Object object , final Class < ? > . . . classes ) {
 if ( classes != null ) {
 - for ( final Class < ? > each : classes ) {
 - if ( each . isInstance ( child ) ) return true ;
 + for ( final Class < ? > c : classes ) {
 + if ( c . isInstance ( object ) ) return true ;
 }
 }
 return false ;


<nb> public abstract class SmartPointerManager {
 }

 COMMENT
 - COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 COMMENT
 @ notnull public abstract < E extends PsiElement > SmartPsiElementPointer < E > createSmartPsiElementPointer ( @ notnull E element ) ;
 +
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 @ notnull public abstract < E extends PsiElement > SmartPsiElementPointer < E > createSmartPsiElementPointer ( @ notnull E element , PsiFile containingFile ) ;

 COMMENT

add javadoc for smart pointer creation with containing file


<nb> package NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class GenericFile < T > implements Serializable {
 COMMENT
 COMMENT
 protected String normalizePathToProtocol ( String path ) {
 + if ( ObjectHelper . isEmpty ( path ) ) {
 + return path ;
 + }
 return path . replaceAll ( STRING0 , getFileSeparator ( ) ) ;
 }

Fixed minor issue with setting endpoint path


<nb> import NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - public class TestRCFileStorage {
 + public class TestRCFileProtobufStorage {

 private PigServer pigServer ;
 private final String testDir =
 - System . getProperty ( STRING0 ) + STRING1 ;
 + System . getProperty ( STRING0 ) + STRING2 ;
 private final File inputDir = new File ( testDir , STRING3 ) ;
 private final File rcfile_in = new File ( testDir , STRING4 ) ;


<nb> public class RealmResultsTest extends AndroidTestCase {
 RealmResults < AllTypes > result = testRealm . allObjects ( AllTypes . class ) ;
 RealmResults < AllTypes > sortedResult = result . sort ( FIELD_STRING ) ;
 } catch ( IllegalArgumentException e ) {
 - fail ( STRING0 ) ;
 + fail ( STRING1 ) ;
 }
 }

 <nb> public class RealmResultsTest extends AndroidTestCase {
 try {
 RealmResults < AllTypes > sortResult = testRealm . where ( AllTypes . class ) . findAll ( ) . sort ( FIELD_STRING ) ;
 } catch ( IllegalArgumentException e ) {
 - fail ( STRING2 ) ;
 + fail ( STRING3 ) ;
 }
 }


<nb> public class DefaultServlet

 String name = cacheEntry . name ;

 - SINGLE
 - int trim = name . length ( ) ;
 - if ( ! name . endsWith ( STRING0 ) )
 - trim += NUMBER0 ;
 - if ( name . equals ( STRING0 ) )
 - trim = NUMBER0 ;
 -
 SINGLE
 ByteArrayOutputStream stream = new ByteArrayOutputStream ( ) ;
 OutputStreamWriter osWriter = new OutputStreamWriter ( stream , STRING1 ) ;


<nb> abstract public class TreeImportingParserBase implements ImportingParser {
 }
 }

 + rootColumnGroup . tabulate ( ) ;
 XmlImportUtilities . createColumnsFromImport ( project , rootColumnGroup ) ;
 project . columnModel . update ( ) ;
 }

Make sure out counts our current before attempting to use them for sorting


<nb> public class Description implements Serializable {
 }

 COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT

reformatted a comment as per code review


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 - @ ignore
 - public class AgentInfoSenderIT {
 + public class AgentInfoSenderTest {

 private final Logger logger = LoggerFactory . getLogger ( this . getClass ( ) ) ;

Rename AgentInfoSenderIT to AgentInfoSenderTest


<nb> public class Spider implements Runnable , Task {
 }

 private void waitNewUrl ( ) {
 + newUrlLock . lock ( ) ;
 try {
 - newUrlLock . lock ( ) ;
 SINGLE
 if ( threadAlive . get ( ) == NUMBER0 && exitWhenComplete ) {
 return ;
 }
 - try {
 - newUrlCondition . await ( ) ;
 - } catch ( InterruptedException e ) {
 - }
 - } finally {
 + newUrlCondition . await ( ) ;
 + } catch ( InterruptedException e ) {
 + logger . warn ( STRING0 , e ) ;
 + }
 + finally {
 newUrlLock . unlock ( ) ;
 }
 }

combine two try catch block into one make it cleaner


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public abstract class SpdyOrHttpChooser extends ChannelDuplexHandler implements
 }
 }

 + @ override
 + public void flush ( ChannelHandlerContext ctx , ChannelPromise promise ) throws Exception {
 + ctx . flush ( promise ) ;
 + }
 +
 private boolean initPipeline ( ChannelHandlerContext ctx ) {
 SINGLE
 SslHandler handler = ctx . pipeline ( ) . get ( SslHandler . class ) ;

Also provide implementation for flush out of the box


<nb>
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 +
 package NAMESPACE ;

 import NAMESPACE ;

Added back license header lost in conversion


<nb> public class ForeignKeyContainer < ModelClass extends Model > extends SimpleModelCo
 return model ;
 }

 + COMMENT
 + COMMENT
 + COMMENT
 + public ModelClass reload ( ) {
 + model = null ;
 + return load ( ) ;
 + }
 +
 @ override
 public boolean exists ( ) {
 ModelClass model = toModel ( ) ;


<nb> class ContextImpl extends Context {
 return getDropBoxManager ( ) ;
 } else if ( DEVICE_POLICY_SERVICE . equals ( name ) ) {
 return getDevicePolicyManager ( ) ;
 - } else if ( UIMODE_SERVICE . equals ( name ) ) {
 + } else if ( UI_MODE_SERVICE . equals ( name ) ) {
 return getUiModeManager ( ) ;
 }


<nb> public class Record {
 ( q . getName ( ) . equals ( name ) ) ;
 }

 + public String getName ( ) {
 + return name ;
 + }
 +
 public Data getPayload ( ) {
 return payloadData ;
 }


<nb> public class CamelContextFactoryBean extends IdentifiedType implements RouteCont
 SINGLE
 getContext ( ) ;

 - log . info ( STRING0 + getRoutes ( ) ) ;
 + log . debug ( STRING0 + getRoutes ( ) ) ;

 findRouteBuiders ( ) ;
 installRoutes ( ) ;
 <nb> public class CamelContextFactoryBean extends IdentifiedType implements RouteCont
 if ( event instanceof ContextRefreshedEvent ) {
 SINGLE
 try {
 - log . info ( STRING1 ) ;
 + log . debug ( STRING1 ) ;
 getContext ( ) . start ( ) ;
 }
 catch ( Exception e ) {


<nb> public class WordPress extends Application {
 }
 }

 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 private void startActivityTransitionTimer ( ) {
 this . mActivityTransitionTimer = new Timer ( ) ;
 this . mActivityTransitionTimerTask = new TimerTask ( ) {

Added some comments that describe how we re detecting the onBackground state


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 import NAMESPACE ;
 <nb> public class InitialFlowSetupActionTests {
 assertNotNull ( WebUtils . getRegisteredService ( context ) ) ;
 assertEquals ( STRING0 , event . getId ( ) ) ;
 }
 +
 + @ test ( expected = NoSuchFlowExecutionException . class )
 + public void disableFlowIfNoService ( ) throws Exception {
 + this . action . setEnableFlowOnAbsentServiceRequest ( false ) ;
 + final MockRequestContext context = new MockRequestContext ( ) ;
 + final MockHttpServletRequest request = new MockHttpServletRequest ( ) ;
 + context . setExternalContext ( new ServletExternalContext ( new MockServletContext ( ) , request , new MockHttpServletResponse ( ) ) ) ;
 +
 + this . action . execute ( context ) ;
 + }
 }


<nb> public class RegisteredInvocations implements Serializable {
 }

 public void removeLast ( ) {
 - int last = invocations . size ( ) - NUMBER0 ;
 - invocations . remove ( last ) ;
 + SINGLE
 + synchronized ( invocations ) {
 + int last = invocations . size ( ) - NUMBER0 ;
 + invocations . remove ( last ) ;
 + }
 }

 public List < Invocation > getAll ( ) {

Added some synchronization code to make Mockito behave slightly better when stubbing occurs in multiple threads on shared mock


<nb> public abstract class FilteredTraverserBase < T , Self extends FilteredTraverserBas

 protected static class Meta < T > {
 - public final Iterable < ? extends T > roots ;
 - public final TreeTraversal traversal ;
 - public final Condition < ? super T > expandFilter ;
 - public final Condition < ? super T > childFilter ;
 - public final Condition < ? super T > resultFilter ;
 -
 - public final Condition < ? super T > forceExclude ;
 - public final Condition < ? super T > forceExpandAndSkip ;
 + final Iterable < ? extends T > roots ;
 + final TreeTraversal traversal ;
 + final Condition < ? super T > expandFilter ;
 + final Condition < ? super T > childFilter ;
 + final Condition < ? super T > resultFilter ;
 +
 + final Condition < ? super T > forceExclude ;
 + final Condition < ? super T > forceExpandAndSkip ;

 public Meta ( @ notnull Iterable < ? extends T > roots ,
 @ notnull TreeTraversal traversal ,


<nb> public class AdminRoutes {
 router . add ( GET , STRING0 , GetAllStubMappingsTask . class ) ;
 router . add ( POST , STRING0 , CreateStubMappingTask . class ) ;

 - router . add ( POST , STRING1 , StubMappingTask . class ) ; SINGLE
 + router . add ( POST , STRING1 , OldCreateStubMappingTask . class ) ; SINGLE
 router . add ( POST , STRING2 , OldRemoveStubMappingTask . class ) ; SINGLE
 router . add ( POST , STRING3 , OldEditStubMappingTask . class ) ; SINGLE
 router . add ( POST , STRING4 , SaveMappingsTask . class ) ;
 <nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 - public class StubMappingTask implements AdminTask {
 + public class OldCreateStubMappingTask implements AdminTask {

 @ override
 public ResponseDefinition execute ( Admin admin , Request request , PathParams pathParams ) {


<nb>

 package NAMESPACE ;

 + import NAMESPACE ;
 +
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> import NAMESPACE ;
 COMMENT
 COMMENT
 @ configuration
 - @ conditionalonclass ( EhCacheCacheManager . class )
 + @ conditionalonclass ( { Cache . class , EhCacheCacheManager . class } )
 @ conditionalonmissingbean ( CacheManager . class )
 @ conditional ( { CacheCondition . class ,
 EhCacheCacheConfiguration . ConfigAvailableCondition . class } )

Add missing type check on EhCacheCacheConfiguration


<nb> public class EduStepicConnector {
 }
 }

 - final HttpPost attemptRequest = new HttpPost ( stepicApiUrl + STRING0 ) ;
 + final HttpPost attemptRequest = new HttpPost ( stepicApiUrl + STRING1 ) ;
 setHeaders ( attemptRequest , STRING2 ) ;
 String attemptRequestBody = new Gson ( ) . toJson ( new StepicWrappers . AttemptWrapper ( task . getStepicId ( ) ) ) ;
 attemptRequest . setEntity ( new StringEntity ( attemptRequestBody , ContentType . APPLICATION_JSON ) ) ;
 <nb> public class EduStepicConnector {
 }

 private static void postSubmission ( boolean passed , StepicWrappers . AttemptWrapper . Attempt attempt , ArrayList < StepicWrappers . SolutionFile > files ) throws IOException {
 - final HttpPost request = new HttpPost ( stepicApiUrl + STRING3 ) ;
 + final HttpPost request = new HttpPost ( stepicApiUrl + STRING4 ) ;
 setHeaders ( request , STRING2 ) ;

 String requestBody = new Gson ( ) . toJson ( new StepicWrappers . SubmissionWrapper ( attempt . id , passed ? STRING5 : STRING6 , files ) ) ;


<nb> public class Transaction extends ChildMessage {
 s . append ( String . format ( Locale . US , STRING0 , time ) ) ;
 }
 if ( isOptInFullRBF ( ) ) {
 - s . append ( STRING1 ) ;
 + s . append ( STRING2 ) ;
 }
 if ( inputs . size ( ) == NUMBER0 ) {
 s . append ( String . format ( Locale . US , STRING3 ) ) ;


<nb> public abstract class BaseStatusBar extends SystemUI implements

 }

 - H createHandler ( ) {
 + protected H createHandler ( ) {
 return new H ( ) ;
 }

 <nb> public class PhoneStatusBar extends BaseStatusBar {
 }

 @ override
 - BaseStatusBar . H createHandler ( ) {
 + protected BaseStatusBar . H createHandler ( ) {
 return new PhoneStatusBar . H ( ) ;
 }

 <nb> public class TabletStatusBar extends BaseStatusBar implements
 }

 @ override
 - BaseStatusBar . H createHandler ( ) {
 + protected BaseStatusBar . H createHandler ( ) {
 return new TabletStatusBar . H ( ) ;
 }


<nb> public abstract class AsynchronousProcessor implements AsyncSupport < AtmosphereRe
 }

 SINGLE
 - SINGLE
 + SINGLE
 }
 invokeAtmosphereHandler ( impl ) ;


<nb> public abstract class SessionPage extends WebPage {
 . getAttribute ( Constants . AUTHENTICATION_TYPE ) ;

 SINGLE
 - session . replaceSession ( ) ;
 + SINGLE
 + SINGLE
 + SINGLE
 + if ( AuthenticationType . CONTAINER != authenticationType ) {
 + session . replaceSession ( ) ;
 + }
 session . setUser ( user ) ;

 request . getSession ( ) . setAttribute ( Constants . AUTHENTICATION_TYPE , authenticationType ) ;

Create web rewriteSession key for use with tomcat and CAS


<nb> public interface Ordered {
 COMMENT
 int LOWEST_PRECEDENCE = Integer . MAX_VALUE ;

 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + int NOT_ORDERED = ( Integer . MIN_VALUE + NUMBER0 ) / NUMBER1 ; SINGLE

 COMMENT
 COMMENT


<nb>

 package NAMESPACE ;

 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class IOBalancerMemoryLeakTest extends HazelcastTestSupport {

 @ test
 public void testEachConnectionUseDifferentSelectorEventually ( ) throws IOException {
 - HazelcastInstance instance = Hazelcast . newHazelcastInstance ( ) ;
 + Config config = new Config ( ) ;
 + config . getGroupConfig ( ) . setName ( randomName ( ) ) ;
 + HazelcastInstance instance = Hazelcast . newHazelcastInstance ( config ) ;
 HTTPCommunicator communicator = new HTTPCommunicator ( instance ) ;
 TcpIpConnectionManager connectionManager = ( TcpIpConnectionManager ) getConnectionManager ( instance ) ;
 for ( int i = NUMBER0 ; i < NUMBER1 ; i ++ ) {

randomize group name to make this test prone to unintentional joins from multicast


<nb> public class CloudNotifier {
 showMessage ( message , messageType , null ) ;
 }

 - public void showMessage ( String message , MessageType messageType , @ nullable NotificationListener listener ) {
 + public Notification showMessage ( String message , MessageType messageType , @ nullable NotificationListener listener ) {
 NotificationGroup notificationGroup = NotificationGroup . balloonGroup ( myNotificationDisplayId ) ;
 Notification notification = notificationGroup . createNotification ( STRING0 , message , messageType . toNotificationType ( ) , listener ) ;
 notification . notify ( null ) ;
 + return notification ;
 }
 }
 <nb> public class CloudGitChooseAccountStep < DC extends CloudDeploymentNameConfigurati
 return super . validate ( ) ;
 }

 - private void createRunConfiguration ( Module module , String applicationName ) {
 + public void createRunConfiguration ( Module module , String applicationName ) {
 DC deploymentConfiguration = myDetector . createDeploymentConfiguration ( ) ;

 boolean defaultName = module . getName ( ) . equals ( applicationName ) ;


<nb> public class PipeliningTest extends Assert {

 @ before
 public void setUp ( ) throws Exception {
 - jedis = new Jedis ( hnp . getHost ( ) , hnp . getPort ( ) , NUMBER0 ) ;
 + jedis = new Jedis ( hnp . getHost ( ) , hnp . getPort ( ) , NUMBER1 ) ;
 jedis . connect ( ) ;
 jedis . auth ( STRING0 ) ;
 jedis . flushAll ( ) ;

Set Jedis timeout longer while PipeliningTest


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb>
 You should have received a copy of the GNU General Public License
 COMMENT

 - package NAMESPACE ;
 + package NAMESPACE ;

 import NAMESPACE ;
 import NAMESPACE ;
 <nb>
 You should have received a copy of the GNU General Public License
 COMMENT

 - package NAMESPACE ;
 + package NAMESPACE ;

 import NAMESPACE ;

 <nb>
 You should have received a copy of the GNU General Public License
 COMMENT

 - package NAMESPACE ;
 + package NAMESPACE ;

 import NAMESPACE ;
 import NAMESPACE ;


<nb> public interface IncludedBuild {
 File getProjectDir ( ) ;

 COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT


<nb> public class UndertowJSRWebSocketDeploymentProcessor implements DeploymentUnitPr

 SINGLE
 SINGLE
 - final ServiceName moduleContextServiceName = ContextNames . contextServiceNameOfModule ( moduleDescription . getApplicationName ( ) , moduleDescription . getModuleName ( ) ) ;
 - bindJndiServices ( deploymentUnit , phaseContext . getServiceTarget ( ) , moduleContextServiceName , webSocketDeploymentInfo ) ;
 + if ( moduleDescription != null ) {
 + final ServiceName moduleContextServiceName = ContextNames . contextServiceNameOfModule ( moduleDescription . getApplicationName ( ) , moduleDescription . getModuleName ( ) ) ;
 + bindJndiServices ( deploymentUnit , phaseContext . getServiceTarget ( ) , moduleContextServiceName , webSocketDeploymentInfo ) ;
 + }
 }

 private void bindJndiServices ( final DeploymentUnit deploymentUnit , final ServiceTarget serviceTarget , final ServiceName contextServiceName , final WebSocketDeploymentInfo webSocketInfo ) {

Prevent NPE in websocket processor if EE module is not present


<nb> import NAMESPACE ;
 import NAMESPACE ;

 import NAMESPACE ;
 + import NAMESPACE ;
 +
 import NAMESPACE ;
 import NAMESPACE ;

 <nb> public final class NetworkAddressUtils {
 COMMENT
 COMMENT
 COMMENT
 - public static final boolean WINDOWS = System . getProperty ( STRING0 ) . startsWith ( STRING1 ) ;
 + public static final boolean WINDOWS = SystemUtils . IS_OS_WINDOWS ;
 private static final Logger LOG = LoggerFactory . getLogger ( Constants . LOGGER_TYPE ) ;

 private static String sLocalHost ;


<nb> public class AMQPConsumer implements Runnable {
 LOG . info ( msg ) ;
 server . getActivityWriter ( ) . write ( new Activity ( msg , AMQPConsumer . class ) ) ;
 } catch ( IOException e ) {
 - LOG . error ( STRING0 + queueConfig + STRING1 , e ) ;
 + String msg = STRING0 + queueConfig + STRING2 + e . getMessage ( ) + STRING3 ;
 + LOG . error ( msg , e ) ;
 + server . getActivityWriter ( ) . write ( new Activity ( msg , AMQPConsumer . class ) ) ;
 +
 disconnect ( ) ;
 }
 }

write server activity if AMQP connections breaks


<nb>
 COMMENT
 package NAMESPACE ;

 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public abstract class NonClasspathClassFinder extends PsiElementFinder {
 if ( scope . contains ( classRoot ) ) {
 final VirtualFile dir = classRoot . findFileByRelativePath ( qname . replace ( STRING0 , STRING1 ) ) ;
 if ( dir != null && dir . isDirectory ( ) ) {
 - final PsiDirectory psiDirectory = psiManager . findDirectory ( dir ) ;
 + final PsiDirectory psiDirectory = ApplicationManager . getApplication ( ) . runReadAction ( new Computable < PsiDirectory > ( ) {
 + public PsiDirectory compute ( ) {
 + return psiManager . findDirectory ( dir ) ;
 + }
 + } ) ;
 assert psiDirectory != null ;
 if ( ! consumer . process ( psiDirectory ) ) {
 return false ;


<nb> public class LwjglRenderer implements Renderer {
 case ThreeDimensional :
 case CubeMap : SINGLE
 glTexParameteri ( target , GL_TEXTURE_WRAP_R , convertWrapMode ( tex . getWrap ( WrapAxis . R ) ) ) ;
 + SINGLE
 case TwoDimensional :
 case TwoDimensionalArray :
 glTexParameteri ( target , GL_TEXTURE_WRAP_T , convertWrapMode ( tex . getWrap ( WrapAxis . T ) ) ) ;

Added a comment setupTextureParams in LwjglRenderer about the switch with missing breaks


<nb> public abstract class ExtendableListView extends AbsListView {
 }

 mDataChanged = true ;
 - mItemCount = adapter != null ? adapter . getCount ( ) : NUMBER0 ;
 + mItemCount = mAdapter != null ? mAdapter . getCount ( ) : NUMBER0 ;

 if ( adapter != null ) {
 adapter . registerDataSetObserver ( mObserver ) ;


<nb> public class UkrainianMyspellTagger implements Tagger {
 if ( wordsToPos == null ) {
 wordsToPos = new HashMap < String , String [ ] > ( ) ;
 File resourceFile = JLanguageTool . getAbsoluteFile ( RESOURCE_FILENAME ) ;
 - System . err . println ( STRING0 + resourceFile ) ;
 + SINGLE

 BufferedReader input = new BufferedReader ( new InputStreamReader ( new FileInputStream ( resourceFile ) , Charset . forName ( STRING1 ) ) ) ;

 <nb> public class UkrainianMyspellTagger implements Tagger {
 wordsToPos . put ( wrd [ NUMBER0 ] , posTags . toArray ( new String [ NUMBER0 ] ) ) ;
 }
 }
 - System . err . println ( STRING2 + wordsToPos . size ( ) ) ;
 + SINGLE
 }

 for ( Iterator < String > iter = sentenceTokens . iterator ( ) ; iter . hasNext ( ) ; ) {


<nb> public class SharedBlockingCallback
 {
 while ( _blocker . _state != IDLE )
 {
 - if ( idle > NUMBER0 )
 + if ( idle > NUMBER0 && ( idle < Long . MAX_VALUE / NUMBER1 ) )
 {
 SINGLE
 if ( ! _idle . await ( idle * NUMBER1 , TimeUnit . MILLISECONDS ) )
 <nb> public class SharedBlockingCallback
 {
 while ( _state == null )
 {
 - if ( idle > NUMBER0 )
 + if ( idle > NUMBER0 && ( idle < Long . MAX_VALUE / NUMBER1 ) )
 {
 SINGLE
 if ( ! _complete . await ( idle + idle / NUMBER1 , TimeUnit . MILLISECONDS ) )
 <nb> public class SharedBlockingCallback
 }
 }

 - private class BlockerTimeoutException extends TimeoutException
 + private static class BlockerTimeoutException extends TimeoutException
 {
 }
 }

SharedBlockingCallback does not handle connector max idle time of Long MAX_VALUE BlockerTimeoutException not serializable


<nb> public class AccountUtils

 return protocolProviderFactory ;
 }
 +
 +
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + public static Collection < ProtocolProviderService > getRegisteredProviders ( )
 + {
 + List < ProtocolProviderService > registeredProviders
 + = new LinkedList < ProtocolProviderService > ( ) ;
 +
 + for ( ProtocolProviderFactory providerFactory : UtilActivator
 + . getProtocolProviderFactories ( ) . values ( ) )
 + {
 + ServiceReference serRef ;
 + ProtocolProviderService protocolProvider ;
 +
 + for ( AccountID accountID : providerFactory . getRegisteredAccounts ( ) )
 + {
 + serRef = providerFactory . getProviderForAccount ( accountID ) ;
 +
 + protocolProvider
 + = ( ProtocolProviderService ) UtilActivator . bundleContext
 + . getService ( serRef ) ;
 +
 + registeredProviders . add ( protocolProvider ) ;
 + }
 + }
 + return registeredProviders ;
 + }
 }

Adds a getRegisteredProviders method in the AccountUtils


<nb> public class PackageSetChooserCombo extends ComboboxWithBrowseButton {

 public PackageSetChooserCombo ( final Project project , String preselect ) {
 final JComboBox combo = getComboBox ( ) ;
 + combo . setBorder ( null ) ;
 myProject = project ;
 addActionListener ( new ActionListener ( ) {
 public void actionPerformed ( ActionEvent e ) {


<nb> extends BaseTest < A , AP , B , S , B2S , BS , L , X , DATE , BOOL , D , T , U , I , IPK , T658 ,
 SINGLE
 switch ( getDialect ( ) ) {
 case SQLITE :
 + case INGRES : SINGLE
 log . info ( STRING0 , STRING1 ) ;
 break ;

Circumvent funny internal errors in INGRES when using ALL


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 <nb> public final class XPathLanguage extends Language {
 }

 public boolean canFindUsagesFor ( @ notnull PsiElement psiElement ) {
 - return psiElement instanceof XPathFunction ;
 + return psiElement instanceof XPathFunction || psiElement instanceof XPathVariable ;
 }

 @ nullable
 <nb> public final class XPathLanguage extends Language {

 @ notnull
 public String getType ( @ notnull PsiElement element ) {
 - return element instanceof XPathFunction ? STRING0 : STRING1 ;
 + if ( element instanceof XPathFunction ) {
 + return STRING0 ;
 + } else if ( element instanceof XPathVariable ) {
 + return STRING2 ;
 + } else {
 + return STRING1 ;
 + }
 }

 @ notnull


<nb> import NAMESPACE ;

 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class ReaderActivityLauncher {
 SINGLE
 ReaderSearchTable . addOrUpdateQueryString ( query ) ;

 - SINGLE
 - ReaderPostTable . deletePostsWithTag ( ReaderSearchService . getTagForSearchQuery ( query ) ) ;
 -
 SINGLE
 SINGLE

No longer removing previous search results


<nb> public class ActionMenuPresenter extends BaseMenuPresenter
 @ override
 public void onDismiss ( ) {
 super . onDismiss ( ) ;
 - mMenu . close ( ) ;
 + if ( mMenu != null ) {
 + mMenu . close ( ) ;
 + }
 mOverflowPopup = null ;
 }
 }


<nb> public final class ProcessEs6Modules extends AbstractPostOrderCallback {
 static final DiagnosticType USELESS_USE_STRICT_DIRECTIVE =
 DiagnosticType . warning (
 STRING0 ,
 - STRING1 ) ;
 + STRING2 ) ;

 static final DiagnosticType NAMESPACE_IMPORT_CANNOT_USE_STAR =
 DiagnosticType . error (


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;

 @ eactivity ( R . layout . my_activity )
 public class MyActivity extends Activity {
 <nb> public class MyActivity extends Activity {
 @ systemservice
 WindowManager windowManager ;

 - COMMENT
 - COMMENT
 - COMMENT
 - public void onBackPressed ( ) {
 - Toast . makeText ( this , STRING0 , Toast . LENGTH_SHORT ) . show ( ) ;
 - }
 -
 @ override
 protected void onCreate ( Bundle savedInstanceState ) {
 super . onCreate ( savedInstanceState ) ;


<nb> public class EditSession {
 pos = pos . subtract ( NUMBER0 , height , NUMBER0 ) ;
 }

 - if ( pos . getBlockY ( ) - height - NUMBER1 < NUMBER0 ) {
 + SINGLE
 + if ( height < NUMBER0 && pos . getBlockY ( ) - height - NUMBER1 < NUMBER0 ) {
 height = pos . getBlockY ( ) + NUMBER1 ;
 } else if ( pos . getBlockY ( ) + height - NUMBER1 > NUMBER2 ) {
 height = NUMBER2 - pos . getBlockY ( ) + NUMBER1 ;


<nb> public class TrustManagerService extends SystemService {
 private void removeListener ( ITrustListener listener ) {
 for ( int i = NUMBER0 ; i < mTrustListeners . size ( ) ; i ++ ) {
 if ( mTrustListeners . get ( i ) . asBinder ( ) == listener . asBinder ( ) ) {
 - mTrustListeners . get ( i ) ;
 + mTrustListeners . remove ( i ) ;
 return ;
 }
 }

Fix removeListener in TrustManagerService


<nb> import NAMESPACE ;
 import NAMESPACE ;

 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 public final class CcToolchainSuiteRule implements RuleDefinition {


<nb> public class JSONObject {
 }

 - public JSONObject setJSONObject ( String key , String value ) {
 + public JSONObject setJSONObject ( String key , JSONObject value ) {
 return put ( key , value ) ;
 }

 - public JSONObject setJSONArray ( String key , String value ) {
 + public JSONObject setJSONArray ( String key , JSONArray value ) {
 return put ( key , value ) ;
 }


<nb> import NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public class SquidbJacksonSupport {
 @ suppresswarnings ( STRING0 )
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 public static < T > T getObjectValue ( AbstractModel model , StringProperty property , JavaType type ) {
 if ( ! model . hasTransitory ( property . getName ( ) ) ) {
 <nb> public class SquidbJacksonSupport {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 COMMENT
 public static boolean setObjectProperty ( AbstractModel model , StringProperty property , Object data ) {
 try {

Fix weird javadoc issues that were causing compile errors


<nb> public class SipRegistrarConnection
 unregister ( false ) ;
 return ;
 }
 -
 +
 + SINGLE
 + SINGLE
 + updateRegisterSequenceNumber ( retryTran ) ;
 +
 retryTran . sendRequest ( ) ;
 return ;
 }
 <nb> public class SipRegistrarConnection
 return className + STRING0 + sipProvider . getOurDisplayName ( )
 + STRING1 + sipProvider . getOurSipAddress ( ) + STRING2 ;
 }
 +
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + private void updateRegisterSequenceNumber ( ClientTransaction lastClientTran )
 + {
 + Request req = lastClientTran . getRequest ( ) ;
 +
 + CSeqHeader cSeqHeader = ( CSeqHeader ) req . getHeader ( CSeqHeader . NAME ) ;
 + long sequenceNumber = cSeqHeader . getSeqNumber ( ) ;
 +
 + SINGLE
 + SINGLE
 + this . nextCSeqValue = sequenceNumber + NUMBER0 ;
 + }
 }


<nb> public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 if ( avatar != null ) {
 intent = new Intent ( getApplicationContext ( ) ,
 StartConversationActivity . class ) ;
 - intent . putExtra ( STRING0 , true ) ;
 + if ( xmppConnectionService != null && xmppConnectionService . getAccounts ( ) . size ( ) == NUMBER0 ) {
 + intent . putExtra ( STRING0 , true ) ;
 + }
 } else {
 intent = new Intent ( getApplicationContext ( ) ,
 PublishProfilePictureActivity . class ) ;
 <nb> public class PublishProfilePictureActivity extends XmppActivity {
 if ( mInitialAccountSetup ) {
 Intent intent = new Intent ( getApplicationContext ( ) ,
 StartConversationActivity . class ) ;
 - intent . putExtra ( STRING0 , true ) ;
 + if ( xmppConnectionService != null && xmppConnectionService . getAccounts ( ) . size ( ) == NUMBER0 ) {
 + intent . putExtra ( STRING0 , true ) ;
 + }
 startActivity ( intent ) ;
 }
 finish ( ) ;

call StartConversationActivity in init mode only after adding the first account


<nb> public class VcsDirtyScopeImpl extends VcsModifiableDirtyScope {
 }
 }
 if ( ! myDirtyDirectoriesRecursively . isEmpty ( ) ) {
 - result . append ( STRING0 ) ;
 + result . append ( STRING1 ) ;
 for ( THashSet < FilePath > dirsByRoot : myDirtyDirectoriesRecursively . values ( ) ) {
 for ( FilePath file : dirsByRoot ) {
 result . append ( file ) . append ( STRING2 ) ;


<nb> public class MessagingController implements Runnable {

 if ( modeMismatch ( aDisplayMode , fDisplayClass ) ) {
 SINGLE
 - COMMENT
 - if ( K9 . DEBUG )
 - Log . v ( K9 . LOG_TAG , STRING0 + localFolder . getName ( ) +
 - STRING1 + fDisplayClass + STRING2 + aDisplayMode ) ;
 - COMMENT
 return false ;
 }

 if ( modeMismatch ( aNotifyMode , fNotifyClass ) ) {
 SINGLE
 - COMMENT
 - if ( K9 . DEBUG )
 - Log . v ( K9 . LOG_TAG , STRING0 + localFolder . getName ( ) +
 - STRING3 + fNotifyClass + STRING4 + aNotifyMode ) ;
 - COMMENT
 return false ;
 }


<nb> public class ActivitiExtension implements Extension {
 private static Logger logger = Logger . getLogger ( ActivitiExtension . class . getName ( ) ) ;

 private static ProcessEngine processEngine ;
 +
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + public static boolean skipProcessEngineSetup = false ;

 public static ProcessEngine getProcessEngine ( ) {
 return processEngine ;
 <nb> public class ActivitiExtension implements Extension {

 public void afterDeploymentValidation ( @ observes AfterDeploymentValidation event ) {
 try {
 + if ( skipProcessEngineSetup ) {
 + return ;
 + }
 logger . info ( STRING0 ) ;
 -
 - SINGLE
 - initializeProcessEngine ( ) ;

 - SINGLE
 - deployProcesses ( ) ;
 -
 + SINGLE
 + initializeProcessEngine ( ) ;
 + SINGLE
 + deployProcesses ( ) ;
 } catch ( Exception e ) {
 SINGLE
 SINGLE
 event . addDeploymentProblem ( e ) ;
 - return ;
 }
 }

added important fix to be able to work with cdi in cycle test environment


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 + import NAMESPACE ;
 + import NAMESPACE ;

 COMMENT
 COMMENT
 <nb> import NAMESPACE ;
 COMMENT
 public abstract class AbstractGenericBindingProvider implements BindingConfigReader , BindingProvider {

 + private static final Logger logger = LoggerFactory . getLogger ( AbstractGenericBindingProvider . class ) ;
 +
 private Set < BindingChangeListener > listeners = Collections . synchronizedSet ( new HashSet < BindingChangeListener > ( ) ) ;

 COMMENT
 <nb> public abstract class AbstractGenericBindingProvider implements BindingConfigRea

 private void notifyListeners ( Item item ) {
 for ( BindingChangeListener listener : listeners ) {
 - listener . bindingChanged ( this , item . getName ( ) ) ;
 + try {
 + listener . bindingChanged ( this , item . getName ( ) ) ;
 + } catch ( Exception e ) {
 + logger . error ( STRING0 + listener . getClass ( ) . getName ( ) + STRING1 , e ) ;
 + }
 }
 }


<nb> public class BlogsEntryLocalServiceImpl extends BlogsEntryLocalServiceBaseImpl {
 }
 }

 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 public BlogsEntry moveEntryToTrash ( long userId , BlogsEntry entry )
 throws PortalException , SystemException {

 <nb> public class BlogsEntryLocalServiceImpl extends BlogsEntryLocalServiceBaseImpl {
 return entry ;
 }

 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 public BlogsEntry moveEntryToTrash ( long userId , long entryId )
 throws PortalException , SystemException {

 <nb> public class BlogsEntryLocalServiceImpl extends BlogsEntryLocalServiceBaseImpl {
 return moveEntryToTrash ( userId , entry ) ;
 }

 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 public void restoreEntryFromTrash ( long userId , long entryId )
 throws PortalException , SystemException {

Revert Partial javadoc for BlogsEntryLocalServiceImpl


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;

 import NAMESPACE ;

 <nb> public final class DefaultIntro2 extends AppIntro2 {
 }

 @ override
 + public void onSkipPressed ( Fragment currentFragment ) {
 + super . onSkipPressed ( currentFragment ) ;
 + loadMainActivity ( ) ;
 + Toast . makeText ( getApplicationContext ( ) , getString ( R . string . skip ) , Toast . LENGTH_SHORT ) . show ( ) ;
 + }
 +
 + @ override
 public void onDonePressed ( Fragment currentFragment ) {
 super . onDonePressed ( currentFragment ) ;


<nb> public class AsyncContextImpl implements AsyncContext {
 implements PrivilegedAction < ClassLoader > {

 public ClassLoader run ( ) {
 - Thread . currentThread ( ) . getContextClassLoader ( ) ;
 - return null ;
 + return Thread . currentThread ( ) . getContextClassLoader ( ) ;
 }
 }


<nb> public class InMemoryPaginatedDataSource < T extends Cacheable > extends InMemoryDa
 paginatedCollection . setOffset ( offset ) ;
 paginatedCollection . setLimit ( limit ) ;
 paginatedCollection . setHasMore ( hasMore ) ;
 + updateLastItemsUpdateTime ( ) ;
 return paginatedCollection ;
 }

Fix bug related with the in memory paginated data source and the ttl policy


<nb> import NAMESPACE ;
 COMMENT
 COMMENT
 public final class WebViewFactory {
 - public static final boolean DEFAULT_TO_EXPERIMENTAL_WEBVIEW = false ;
 + private static final boolean DEFAULT_TO_EXPERIMENTAL_WEBVIEW = false ;
 private static final String EXPERIMENTAL_PROPERTY_DEFAULT_OFF = STRING0 ;
 private static final String EXPERIMENTAL_PROPERTY_DEFAULT_ON = STRING1 ;

 SINGLE
 SINGLE
 - public static final String WEBVIEW_EXPERIMENTAL_PROPERTY = DEFAULT_TO_EXPERIMENTAL_WEBVIEW ?
 + private static final String WEBVIEW_EXPERIMENTAL_PROPERTY = DEFAULT_TO_EXPERIMENTAL_WEBVIEW ?
 EXPERIMENTAL_PROPERTY_DEFAULT_ON : EXPERIMENTAL_PROPERTY_DEFAULT_OFF ;

 private static final String FORCE_PROVIDER_PROPERTY = STRING2 ;
 <nb> public final class ProcessTracker {
 mRuntime = runtime ;
 }
 }
 - String webview = SystemProperties . getBoolean (
 - WebViewFactory . WEBVIEW_EXPERIMENTAL_PROPERTY , false ) ? STRING3 : STRING4 ;
 + String webview = WebViewFactory . useExperimentalWebView ( ) ? STRING3 : STRING4 ;
 if ( ! Objects . equals ( webview , mWebView ) ) {
 changed = true ;
 if ( update ) {


<nb> public class PushSynInfo extends SynInfo
 private int associatedStreamId ;

 public PushSynInfo ( int associatedStreamId , PushInfo pushInfo ) {
 - super ( pushInfo . getHeaders ( ) , pushInfo . isClose ( ) ) ;
 + super ( pushInfo . getTimeout ( ) , pushInfo . getUnit ( ) , pushInfo . getHeaders ( ) , pushInfo . isClose ( ) , ( byte ) NUMBER0 ) ;
 this . associatedStreamId = associatedStreamId ;
 }

 <nb> public class HttpTransportOverSPDY implements HttpTransport
 Fields pushHeaders = createPushHeaders ( scheme , host , pushResource ) ;
 final Fields pushRequestHeaders = createRequestHeaders ( scheme , host , uri , pushResource ) ;

 - SINGLE
 - stream . push ( new PushInfo ( NUMBER0 , TimeUnit . MILLISECONDS , pushHeaders , false ) , new Promise . Adapter < Stream > ( )
 + stream . push ( new PushInfo ( pushHeaders , false ) ,
 + new Promise . Adapter < Stream > ( )
 {
 @ override
 public void succeeded ( Stream pushStream )

fix constructor for PushSynInfo ignores timeout remove timeout for creating push streams in HttpTransportOverSPDY


<nb> public class TextureManager {
 internalformat = GLES11Ext . GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD ;
 break ;
 }
 - return addTexture ( buffer , null , width , height , textureType , null , false , false , isExistingTexture , wrapType , filterType , CompressionType . PVRTC , internalformat ) ;
 + return addTexture ( buffer , null , width , height , textureType , null , false , false , isExistingTexture , wrapType , filterType , CompressionType . ATC , internalformat ) ;
 }

 public TextureInfo addDxt1Texture ( ByteBuffer buffer , int width , int height , TextureType textureType , Dxt1Format format ) {


<nb> public class MessageWindowMenuBar
 {
 pluginContainer . dispose ( ) ;
 helpMenu . dispose ( ) ;
 + optionsMenu . dispose ( ) ;
 }

 COMMENT
 <nb> public class ToolsMenu
 }

 COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + public void dispose ( )
 + {
 + GuiActivator . bundleContext . removeServiceListener ( this ) ;
 +
 + GuiActivator . getUIService ( ) . removePluginComponentListener ( this ) ;
 +
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + removeAll ( ) ;
 + }
 +
 + COMMENT
 COMMENT
 COMMENT
 private class InitVideoBridgeMenuWorkerMacOSX

Fixes a memory leak of the chat window which may also cause disappearing ot some plugins from the toolbar


<nb> import NAMESPACE ;
 import NAMESPACE ;

 import NAMESPACE ;
 - import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;


<nb> public final class XContentBuilder implements BytesStream , Releasable {

 COMMENT
 COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 public XContentBuilder ( XContent xContent , OutputStream bos , String [ ] filters , boolean inclusive ) throws IOException {
 this . bos = bos ;


<nb> public class ZoomPanLayout extends ViewGroup implements
 }
 }
 calculateMinimumScaleToFit ( ) ;
 + constrainScrollToLimits ( ) ;
 }

 COMMENT
 <nb> public class ZoomPanLayout extends ViewGroup implements
 float recalculatedMinScale = Math . max ( minimumScaleX , minimumScaleY ) ;
 if ( recalculatedMinScale != mEffectiveMinScale ) {
 mEffectiveMinScale = recalculatedMinScale ;
 - setScale ( mScale ) ;
 + if ( mScale < mEffectiveMinScale ) {
 + setScale ( mEffectiveMinScale ) ;
 + }
 }
 }
 }

fixing incorrectly computed scroll position during minimum scale layout changes


<nb> public abstract class AbstractStream < K > {
 protected final String name ;
 protected final Set < String > sourceNodes ;

 + public AbstractStream ( AbstractStream < K > stream ) {
 + this . topology = stream . topology ;
 + this . name = stream . name ;
 + this . sourceNodes = stream . sourceNodes ;
 + }
 +
 public AbstractStream ( KStreamBuilder topology , String name , Set < String > sourceNodes ) {
 if ( sourceNodes == null || sourceNodes . isEmpty ( ) ) {
 throw new IllegalArgumentException ( STRING0 ) ;


<nb> public class StorageService implements IEndpointStateChangeSubscriber , StorageSe
 Token parsedBeginToken = getPartitioner ( ) . getTokenFactory ( ) . fromString ( beginToken ) ;
 Token parsedEndToken = getPartitioner ( ) . getTokenFactory ( ) . fromString ( endToken ) ;

 - logger_ . info ( STRING0 ,
 + logger . info ( STRING0 ,
 new Object [ ] { parsedBeginToken , parsedEndToken , tableName , columnFamilies } ) ;
 AntiEntropyService . RepairFuture future = forceTableRepair ( new Range < Token > ( parsedBeginToken , parsedEndToken ) , tableName , isSequential , columnFamilies ) ;
 if ( future == null )
 <nb> public class StorageService implements IEndpointStateChangeSubscriber , StorageSe
 }
 catch ( Exception e )
 {
 - logger_ . error ( STRING1 + future . session . getName ( ) + STRING2 , e ) ;
 + logger . error ( STRING1 + future . session . getName ( ) + STRING2 , e ) ;
 }
 }


<nb> public class ASTGenerator {

 log ( getNodeAsString ( decl ) ) ;

 + COMMENT
 SINGLE

 ASTNode nearestNode = findClosestNode ( lineNumber ,
 <nb> public class ASTGenerator {
 log ( STRING0 + cmem ) ;
 } else
 log ( STRING1 ) ;
 + COMMENT
 }
 }


<nb> public abstract class AbstractLongRunningOperation < T extends AbstractLongRunning
 }

 public T withCancellationToken ( CancellationToken cancellationToken ) {
 - operationParamsBuilder . setCancellationToken ( Preconditions . checkNotNull ( cancellationToken ) ) ;
 + operationParamsBuilder . setCancellationToken ( cancellationToken ) ;
 return getThis ( ) ;
 }
 }


<nb> public class UrlShortener {
 String shortUrl = null ;
 try {
 shortUrl = ( String ) new ShortenUrlTask ( ) . execute ( longUrl ) . get ( ) ;
 - } catch ( InterruptedException e ) {
 - e . printStackTrace ( ) ;
 - } catch ( ExecutionException e ) {
 + } catch ( InterruptedException | ExecutionException e ) {
 e . printStackTrace ( ) ;
 }
 return shortUrl ;
 <nb> public class UrlShortener {
 String longUrl = null ;
 try {
 longUrl = ( String ) new LengthenShortUrlTask ( ) . execute ( shortUrl ) . get ( ) ;
 - } catch ( InterruptedException e ) {
 - e . printStackTrace ( ) ;
 - } catch ( ExecutionException e ) {
 + } catch ( InterruptedException | ExecutionException e ) {
 e . printStackTrace ( ) ;
 }
 return longUrl ;


<nb> class RelationshipTypeHolder
 tx . success ( ) ;
 tx . finish ( ) ;
 success = true ;
 - System . out . println ( STRING0 + name ) ;
 }
 finally
 {


<nb> public class StdLibTestToJSTest extends StdLibTestBase {
 STRING0 ,
 STRING1 ,
 STRING2 ,
 + STRING3 ,
 + STRING4 ,
 STRING5 ) ;
 }
 }

Add platform independent part of Range tests to JS stdlib test run


<nb> public abstract class ColumnSubselection implements Comparable < ColumnSubselectio
 Element eltSelection = ( Element ) subSel ;
 column . cellPathSerializer ( ) . serialize ( eltSelection . element , out ) ;
 break ;
 + default :
 + throw new AssertionError ( ) ;
 }
 - throw new AssertionError ( ) ;
 }

 public ColumnSubselection deserialize ( DataInputPlus in , int version , CFMetaData metadata ) throws IOException
 <nb> public abstract class CollectionType < T > extends AbstractType < T >
 public void validateCellValue ( ByteBuffer cellValue ) throws MarshalException
 {
 if ( isMultiCell ( ) )
 - valueComparator ( ) . validate ( cellValue ) ;
 + valueComparator ( ) . validateCellValue ( cellValue ) ;
 else
 super . validateCellValue ( cellValue ) ;
 }

Fix bug in counter mutation serialization


<nb> public class WebView extends AbsoluteLayout
 public void onVisibilityChanged ( boolean visible ) {
 if ( visible ) {
 switchOutDrawHistory ( ) ;
 + SINGLE
 + mZoomButtonsController . getZoomControls ( ) . setVisibility (
 + View . VISIBLE ) ;
 updateZoomButtonsEnabled ( ) ;
 }
 }
 <nb> public class WebView extends AbsoluteLayout
 SINGLE
 mZoomButtonsController . getZoomControls ( ) . setVisibility ( View . GONE ) ;
 } else {
 - SINGLE
 - mZoomButtonsController . getZoomControls ( )
 - . setVisibility ( View . VISIBLE ) ;
 SINGLE
 SINGLE
 mZoomButtonsController . setZoomInEnabled ( canZoomIn ) ;
 <nb> public class WebView extends AbsoluteLayout
 SINGLE
 SINGLE
 clearTextEntry ( ) ;
 + SINGLE
 + if ( getSettings ( ) . getBuiltInZoomControls ( ) ) {
 + updateZoomButtonsEnabled ( ) ;
 + }
 }
 SINGLE
 SINGLE

Update the zoom buttons after moving to a new page


<nb> public class WelcomeActivity extends ThemeableActivity implements ICacheWordSubs
 public void onCacheWordLocked ( ) {
 if ( mDoLock ) {
 Log . d ( ImApp . LOG_TAG , STRING0 ) ;
 - finish ( ) ;

 } else {
 showLockScreen ( ) ;
 }
 +
 + finish ( ) ;
 }

 @ override

moved finish back to proper place for launching lock screen


<nb> public class InputMethodManagerService extends IInputMethodManager . Stub

 private boolean canAddToLastInputMethod ( InputMethodSubtype subtype ) {
 if ( subtype == null ) return true ;
 - return subtype . containsExtraValueKey ( SUBTYPE_EXTRAVALUE_EXCLUDE_FROM_LAST_IME ) ;
 + return ! subtype . containsExtraValueKey ( SUBTYPE_EXTRAVALUE_EXCLUDE_FROM_LAST_IME ) ;
 }

 private void saveCurrentInputMethodAndSubtypeToHistory ( ) {


<nb> public class RecordingPageCacheMonitor implements PageCacheMonitor
 return trapLatch ;
 }

 - private synchronized void trip ( Event event )
 + private void trip ( Event event )
 {
 + Matcher < ? extends Event > theTrap ;
 + CountDownLatch theTrapLatch ;

 - if ( trap != null && trap . matches ( event ) )
 + SINGLE
 + SINGLE
 + synchronized ( this )
 + {
 + theTrap = trap ;
 + theTrapLatch = trapLatch ;
 + }
 +
 + if ( theTrap != null && theTrap . matches ( event ) )
 {
 try
 {
 - trapLatch . await ( ) ;
 + theTrapLatch . await ( ) ;
 }
 catch ( InterruptedException e )
 {

Fix a potential deadlock in OutOfDiskSpaceTest


<nb> public class DefaultContextLoadTimeWeaver implements LoadTimeWeaver , BeanClassLo
 private LoadTimeWeaver loadTimeWeaver ;

 + public DefaultContextLoadTimeWeaver ( ) {
 + }
 +
 public DefaultContextLoadTimeWeaver ( ClassLoader beanClassLoader ) {
 setBeanClassLoader ( beanClassLoader ) ;
 }

Preserve DefaultContextLoadTimeWeaver no arg ctor


<nb> class DetailsPanel extends JPanel implements ListSelectionListener {

 VcsFullCommitDetails commitData = tableModel . getFullDetails ( row ) ;
 commitPanel . setCommit ( commitData ) ;
 - if ( ! ( commitData instanceof LoadingDetails ) ) {
 + if ( commitData instanceof LoadingDetails ) {
 + myLoadingPanel . startLoading ( ) ;
 + } else {
 newCommitDetails . add ( commitData ) ;
 }
 }
 <nb> class DetailsPanel extends JPanel implements ListSelectionListener {
 public void setCommit ( @ notnull VcsFullCommitDetails commitData ) {
 if ( ! Comparing . equal ( myCommit , commitData ) ) {
 if ( commitData instanceof LoadingDetails ) {
 - myLoadingPanel . startLoading ( ) ;
 myDataPanel . setData ( null ) ;
 myReferencesPanel . setReferences ( Collections . emptyList ( ) ) ;
 updateBorder ( null ) ;

vcs log move startLoading out of CommitPanel


<nb> public class FeedMedia extends FeedFile implements Playable {
 @ override
 public InputStream reopenImageInputStream ( InputStream input ) {
 if ( input instanceof FileInputStream ) {
 - return item . getImage ( ) . reopenImageInputStream ( input ) ;
 + if ( item . hasItemImageDownloaded ( ) ) {
 + return item . getImage ( ) . reopenImageInputStream ( input ) ;
 + } else {
 + return item . getFeed ( ) . getImage ( ) . reopenImageInputStream ( input ) ;
 + }
 } else {
 return new Playable . DefaultPlayableImageLoader ( this )
 . reopenImageInputStream ( input ) ;

Fixed potential image loading issue of FeedMedia


<nb> public class SessionsResource extends RestResource {
 ( ( DefaultSecurityManager ) SecurityUtils . getSecurityManager ( ) ) . getSubjectDAO ( ) . save ( subject ) ;

 } catch ( AuthenticationException e ) {
 - LOG . warn ( STRING0 + createRequest . username ( ) , e ) ;
 + LOG . info ( STRING1 , createRequest . username ( ) ) ;
 } catch ( UnknownSessionException e ) {
 subject . logout ( ) ;
 }

Make log message for invalid credentials less verbose


<nb> public class ComplexCommand extends DefaultCommand {
 out . println ( STRING0 + option2 ) ;
 out . println ( STRING1 + arg1 ) ;
 out . println ( STRING2 + arg2 ) ;
 - if ( executionContext . commandLine ( ) . getAllArguments ( ) . size ( ) > NUMBER0 ) {
 - out . println ( STRING3 + executionContext . commandLine ( ) . getAllArguments ( ) ) ;
 + if ( executionContext . commandLine ( ) . allArguments ( ) . size ( ) > NUMBER0 ) {
 + out . println ( STRING3 + executionContext . commandLine ( ) . allArguments ( ) ) ;
 }
 }
 }

Fix method called after upstream refactoring


<nb> public final class PendingIntent implements Parcelable {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public final class PendingIntent implements Parcelable {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public final class PendingIntent implements Parcelable {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public final class PendingIntent implements Parcelable {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public final class PendingIntent implements Parcelable {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public final class PendingIntent implements Parcelable {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT

Fix documentation of requestCode parameter


<nb> public class GroovyMain {
 StackTraceElement [ ] stackTrace = e . getStackTrace ( ) ;
 for ( int i = NUMBER0 ; i < stackTrace . length ; i ++ ) {
 StackTraceElement element = stackTrace [ i ] ;
 - if ( ! element . getFileName ( ) . endsWith ( STRING0 ) ) {
 + String fileName = element . getFileName ( ) ;
 + if ( fileName != null && ! fileName . endsWith ( STRING0 ) ) {
 System . err . println ( STRING1 + element ) ;
 }
 }

avoid NPE when a stack element has no file name


<nb> import NAMESPACE ;
 import NAMESPACE ;

 import static NAMESPACE ;
 - import static NAMESPACE ;
 + import static NAMESPACE ;
 + import static NAMESPACE ;

 @ config ( emulateSdk = NUMBER0 )
 @ runwith ( RobolectricTestRunner . class )

Qualified Utils static imports in UtilsTest


<nb> public abstract class TransportNodesOperationAction < Request extends NodesOperati
 private void onFailure ( String nodeId , Throwable t ) {
 int idx = index . getAndIncrement ( ) ;
 if ( accumulateExceptions ( ) ) {
 + if ( logger . isDebugEnabled ( ) ) {
 + logger . debug ( STRING0 , t , nodeId ) ;
 + }
 responses . set ( idx , new FailedNodeException ( nodeId , STRING1 + nodeId + STRING2 , t ) ) ;
 }
 if ( counter . incrementAndGet ( ) == responses . length ( ) ) {

add logging if failing to execute on a node


<nb> package NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 - import NAMESPACE ;
 -
 COMMENT
 COMMENT
 COMMENT
 <nb> final class ReadBufferPool {
 super ( ) ;
 }

 - final ByteBuffer acquire ( ChannelBuffer src ) {
 - ByteBuffer dst = acquire ( src . readableBytes ( ) ) ;
 - src . getBytes ( src . readerIndex ( ) , dst ) ;
 - dst . rewind ( ) ;
 - return dst ;
 - }
 -
 final ByteBuffer acquire ( int size ) {
 final SoftReference < ByteBuffer > [ ] pool = this . pool ;
 for ( int i = NUMBER0 ; i < POOL_SIZE ; i ++ ) {

Removed an unused method in ReadBufferPool


<nb> import NAMESPACE ;
 public class RoomInfo {

 COMMENT
 + COMMENT
 + COMMENT
 + private String room ;
 + COMMENT
 COMMENT
 COMMENT
 private String description = STRING0 ;
 <nb> public class RoomInfo {

 RoomInfo ( DiscoverInfo info ) {
 super ( ) ;
 + this . room = info . getFrom ( ) ;
 SINGLE
 this . membersOnly = info . containsFeature ( STRING1 ) ;
 this . moderated = info . containsFeature ( STRING2 ) ;
 <nb> public class RoomInfo {
 }

 COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + public String getRoom ( ) {
 + return room ;
 + }
 +
 + COMMENT
 COMMENT
 COMMENT
 COMMENT

Added JID of the room whose information was discovered


<nb> public abstract class AbstractBlockChain {
 SINGLE
 SINGLE
 SINGLE
 - if ( walletHeight < chainHeight && walletHeight > - NUMBER0 ) {
 + if ( walletHeight < chainHeight && walletHeight > NUMBER1 ) {
 try {
 rollbackBlockStore ( walletHeight ) ;
 log . info ( STRING0 , walletHeight ) ;
 } catch ( BlockStoreException x ) {
 - log . warn ( STRING1 , x ) ;
 + log . warn ( STRING2 ) ;
 }
 }
 }

Better warning messages for the block store rollback code


<nb> class LiveVariablesAnalysis extends
 SINGLE
 lhs = lhs . getLastChild ( ) ;
 }
 - addToSetIfLocal ( lhs , kill ) ;
 - addToSetIfLocal ( lhs , gen ) ;
 + if ( NodeUtil . isName ( lhs ) ) {
 + addToSetIfLocal ( lhs , kill ) ;
 + addToSetIfLocal ( lhs , gen ) ;
 + } else {
 + computeGenKill ( lhs , gen , kill , conditional ) ;
 + }
 computeGenKill ( rhs , gen , kill , conditional ) ;
 }
 return ;
 <nb> public class LiveVariableAnalysisTest extends TestCase {
 assertNotLiveAfterX ( STRING0 , STRING1 ) ;
 }

 + public void testExpressionInForIn ( ) {
 + assertLiveBeforeX ( STRING2 , STRING3 ) ;
 + }
 +
 public void testArgumentsArray ( ) {
 SINGLE
 SINGLE

Allow expressions on LHS of for in loops


<nb> public final class NativeLibraryLoader {
 if ( isRequired ) {
 throw new UnsatisfiedLinkError (
 STRING0 + name + STRING1
 - + STRING2 + pathInJar + STRING1 ) ;
 + + STRING2 + pathInJar
 + + STRING3 + e . getMessage ( ) ) ;
 } else {
 logger . log ( Level . FINE , STRING4 +
 - STRING5 ,
 - new Object [ ] { name , pathInJar } ) ;
 + STRING5 +
 + STRING6 ,
 + new Object [ ] { name , pathInJar , e . getMessage ( ) } ) ;
 }
 }

Don t gobble the exception message when loading via System loadLibrary


<nb> public class ReaderPostService extends Service {
 action = UpdateAction . REQUEST_NEWER ;
 }

 + EventBus . getDefault ( ) . post ( new ReaderEvents . UpdatePostsStarted ( action ) ) ;
 +
 if ( intent . hasExtra ( ARG_TAG ) ) {
 ReaderTag tag = ( ReaderTag ) intent . getSerializableExtra ( ARG_TAG ) ;
 updatePostsWithTag ( tag , action ) ;
 <nb> public class ReaderPostService extends Service {
 stopSelf ( ) ;
 }
 } ) ;
 - EventBus . getDefault ( ) . post ( new ReaderEvents . UpdatePostsStarted ( action ) ) ;
 }

 void updatePostsInBlog ( long blogId , final UpdateAction action ) {


<nb> public class LibraryActivity extends TreeActivity < LibraryTree > implements MenuIt
 }
 }
 tryToDeleteBooks ( books ) ;
 + return true ;
 }
 case OptionsItemId . ExternalView :
 runOrInstallExternalView ( ) ;


<nb> package NAMESPACE ;

 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class ThroughputCounter extends GlobalTrafficShapingHandler {
 return gauges ;
 }

 + @ override
 + public void channelConnected ( ChannelHandlerContext ctx , ChannelStateEvent e )
 + throws Exception {
 + super . channelConnected ( ctx , e ) ;
 + SINGLE
 + ctx . sendUpstream ( e ) ;
 + }
 }

Ensure event propagation in ThroughputCounter


<nb>
 package NAMESPACE ;

 import static NAMESPACE ;
 - import static NAMESPACE ;
 import static NAMESPACE ;

 import NAMESPACE ;
 <nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 <nb> public class UpCommandTest {
 assertTrue ( cliOut [ NUMBER0 ] . contains ( STRING0 ) ) ;

 TestCliUtil . deleteTestLocalConfigAndData ( clientA ) ;
 + TestCliUtil . deleteTestLocalConfigAndData ( clientB ) ;
 }

 @ test

Fix extraneous imports Add missing cleanup


<nb> public class WarClassloadingDependencyProcessor implements DeploymentUnitProcess
 SINGLE

 if ( jsfVersion . equals ( JsfVersionMarker . JSF_1_2 ) ) {
 - ModuleDependency jsf = new ModuleDependency ( moduleLoader , JSF_1_2_IMPL , false , false , false ) ;
 + ModuleDependency jsf = new ModuleDependency ( moduleLoader , JSF_1_2_IMPL , false , false , true ) ;
 jsf . addImportFilter ( PathFilters . getMetaInfFilter ( ) , true ) ;
 moduleSpecification . addSystemDependency ( jsf ) ;
 } else {
 if ( ! jsfVersion . equals ( JsfVersionMarker . JSF_2_0 ) ) {
 logger . warn ( STRING0 + jsfVersion + STRING1 + JsfVersionMarker . JSF_2_0 + STRING2 ) ;
 }
 - ModuleDependency jsf = new ModuleDependency ( moduleLoader , JSF_IMPL , false , false , false ) ;
 + ModuleDependency jsf = new ModuleDependency ( moduleLoader , JSF_IMPL , false , false , true ) ;
 jsf . addImportFilter ( PathFilters . getMetaInfFilter ( ) , true ) ;
 moduleSpecification . addSystemDependency ( jsf ) ;
 }

Add services import to jJSF impl module dependency


<nb> public class AuthCheckFilter implements Filter {
 SINGLE
 SINGLE
 SINGLE
 - SINGLE
 -
 - if ( url . contains ( STRING0 ) ) {
 - url = url . substring ( url . indexOf ( STRING0 ) ) ;
 - }

 if ( exclude . endsWith ( STRING1 ) ) {
 if ( url . startsWith ( exclude . substring ( NUMBER0 , exclude . length ( ) - NUMBER1 ) ) ) {
 <nb> public class AuthCheckFilterTest {

 assertTrue ( AuthCheckFilter . testURLPassesExclude ( STRING2 , STRING3 ) ) ;

 - SINGLE
 - assertFalse ( AuthCheckFilter . testURLPassesExclude ( STRING4 , STRING5 ) ) ;
 assertFalse ( AuthCheckFilter . testURLPassesExclude ( STRING6 , STRING5 ) ) ;
 }
 }

Removed chopping by character in the URL to get MUC Plugin running


<nb> public class ComponentContainer implements ContainerPopulator . Container {
 addSingleton ( this ) ;
 }

 + protected void setParent ( ComponentContainer parent ) {
 + this . parent = parent ;
 + }
 +
 public void execute ( ) {
 boolean threw = true ;
 try {

add protected setParent method to ComponentContainer


<nb> public class ChunkOptionsPopupPanel extends ThemedPopupPanel
 int firstSpaceIdx = extractedChunkHeader . indexOf ( STRING0 ) ;
 int firstCommaIdx = extractedChunkHeader . indexOf ( STRING1 ) ;

 + if ( firstCommaIdx == - NUMBER0 )
 + firstCommaIdx = extractedChunkHeader . length ( ) ;
 +
 return firstCommaIdx <= firstSpaceIdx ?
 STRING2 :
 extractedChunkHeader . substring ( firstSpaceIdx + NUMBER0 , firstCommaIdx ) . trim ( ) ;
 <nb> public class ChunkOptionsPopupPanel extends ThemedPopupPanel
 String newLine =
 chunkHeaderBounds . first +
 chunkPreamble_ +
 - ( label . isEmpty ( ) ? STRING2 : STRING3 + label ) +
 + ( label . isEmpty ( ) ? STRING2 : STRING3 + label ) ;
 +
 + if ( ! chunkOptions_ . isEmpty ( ) )
 + {
 + newLine +=
 STRING4 +
 - StringUtil . collapse ( chunkOptions_ , STRING5 , STRING4 ) +
 + StringUtil . collapse ( chunkOptions_ , STRING5 , STRING4 ) ;
 + }
 +
 + newLine +=
 chunkHeaderBounds . second +
 STRING6 ;


<nb> public class DevicePolicyManagerService extends IDevicePolicyManager . Stub {
 return NUMBER0 ;
 }
 enforceCrossUserPermission ( userHandle ) ;
 - enforceNotManagedProfile ( userHandle , STRING0 ) ;
 synchronized ( this ) {
 if ( who != null ) {
 ActiveAdmin admin = getActiveAdminUncheckedLocked ( who , userHandle ) ;
 <nb> public class DevicePolicyManagerService extends IDevicePolicyManager . Stub {

 private void enforceNotManagedProfile ( int userHandle , String message ) {
 if ( isManagedProfile ( userHandle ) ) {
 - throw new SecurityException ( STRING1 + message + STRING2 ) ;
 + throw new SecurityException ( STRING1 + message + STRING3 ) ;
 }
 }

Remove enforceManagedProfile for listing keyguard features


<nb> public class Autoboxer extends ErrorReportingASTVisitor {
 private Expression box ( Expression expr ) {
 ITypeBinding wrapperBinding = Types . getWrapperType ( Types . getTypeBinding ( expr ) ) ;
 if ( wrapperBinding != null ) {
 - return boxWithType ( expr , wrapperBinding ) ;
 + return newBoxExpression ( expr , wrapperBinding ) ;
 } else {
 return NodeCopier . copySubtree ( ast , expr ) ;
 }
 }

 private Expression boxWithType ( Expression expr , ITypeBinding wrapperType ) {
 + if ( Types . isBoxedPrimitive ( wrapperType ) ) {
 + return newBoxExpression ( expr , wrapperType ) ;
 + }
 + return box ( expr ) ;
 + }
 +
 + private Expression newBoxExpression ( Expression expr , ITypeBinding wrapperType ) {
 ITypeBinding primitiveType = Types . getPrimitiveType ( wrapperType ) ;
 assert primitiveType != null ;
 IMethodBinding wrapperMethod = BindingUtil . findDeclaredMethod (


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public abstract class ReliableTopicBasicTest extends HazelcastTestSupport {
 } ) ;
 }

 - @ repeat ( NUMBER0 )
 @ test
 public void publishMultiple ( ) throws InterruptedException {
 final ReliableMessageListenerMock listener = new ReliableMessageListenerMock ( ) ;


<nb> public class BuckConfig {
 COMMENT
 COMMENT
 public String getPythonInterpreter ( ) {
 - Preconditions . checkState ( environment . containsKey ( STRING0 ) , STRING1 ) ;
 Optional < String > configPath = getValue ( STRING2 , STRING3 ) ;
 if ( configPath . isPresent ( ) ) {
 SINGLE


<nb> public class SimpleDrawerActivity extends ActionBarActivity {

 headerResult = new AccountHeader ( )
 . withActivity ( this )
 + SINGLE
 . withHeaderBackground ( R . drawable . header )
 . addProfiles (
 profile ,


<nb> public class CarBenchmark
 fuelFigures . speed ( NUMBER0 ) ;

 final Car . PerformanceFigures performanceFigures = state . car . performanceFigures ( ) ;
 - performanceFigures . accelerationSize ( NUMBER1 ) ;
 + performanceFigures . accelerationCount ( NUMBER1 ) ;
 performanceFigures . octaneRating ( ( short ) NUMBER2 ) ;

 state . car . putMake ( AUDI , NUMBER3 , AUDI . length ) ;

Updated CarBenchmark to use updated code generation pattern


<nb> public final class HazelcastThreadGroup {
 }

 COMMENT
 - COMMENT
 - COMMENT
 - public void interrupt ( ) {
 - internalThreadGroup . interrupt ( ) ;
 - }
 -
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 public void destroy ( ) {
 int numThreads = internalThreadGroup . activeCount ( ) ;
 <nb> public final class OutOfMemoryHandlerHelper {

 HazelcastInstanceImpl factory = ( HazelcastInstanceImpl ) hazelcastInstance ;
 try {
 - factory . node . getHazelcastThreadGroup ( ) . interrupt ( ) ;
 + factory . node . getHazelcastThreadGroup ( ) . destroy ( ) ;
 } catch ( Throwable ignored ) {
 EmptyStatement . ignore ( ignored ) ;
 }

Removed the HazelcastThreadGroup interrupt and replaced it by


<nb> public class ARSCDecoder {
 mPkg . addResSpec ( spec ) ;
 mType . addResSpec ( spec ) ;

 + if ( mConfig == null ) {
 + mConfig = mPkg . getOrCreateConfig ( new ResConfigFlags ( ) ) ;
 + }
 +
 ResValue value = new ResBoolValue ( false , null ) ;
 - ResResource res = new ResResource (
 - mPkg . getOrCreateConfig ( new ResConfigFlags ( ) ) , spec , value ) ;
 + ResResource res = new ResResource ( mConfig , spec , value ) ;
 +
 mPkg . addResource ( res ) ;
 mConfig . addResource ( res ) ;
 spec . addResource ( res ) ;


<nb> package NAMESPACE ;

 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class BaseAdapterHelper {
 return this ;
 }

 - COMMENT
 + COMMENT
 public BaseAdapterHelper setTypeface ( int viewId , Typeface typeface ) {
 TextView view = retrieveView ( viewId ) ;
 view . setTypeface ( typeface ) ;
 + view . setPaintFlags ( view . getPaintFlags ( ) | Paint . SUBPIXEL_TEXT_FLAG ) ;
 return this ;
 }

 - COMMENT
 + COMMENT
 public BaseAdapterHelper setTypeface ( Typeface typeface , int . . . viewIds ) {
 for ( int viewId : viewIds ) {
 TextView view = retrieveView ( viewId ) ;
 view . setTypeface ( typeface ) ;
 + view . setPaintFlags ( view . getPaintFlags ( ) | Paint . SUBPIXEL_TEXT_FLAG ) ;
 }
 return this ;
 }

Enabled subpixel rendering when setting typefaces


<nb> public class StickyGridHeadersGridView extends GridView implements OnScrollListe
 mAreHeadersSticky = a . getBoolean ( attr , true ) ;
 }
 }
 + a . recycle ( ) ;

 ViewConfiguration vc = ViewConfiguration . get ( context ) ;
 mTouchSlop = vc . getScaledTouchSlop ( ) ;


<nb> public final class ActivityManagerService extends ActivityManagerNative

 boolean killed = false ;
 synchronized ( mPidsSelfLocked ) {
 - int [ ] types = new int [ pids . length ] ;
 int worstType = NUMBER0 ;
 for ( int i = NUMBER0 ; i < pids . length ; i ++ ) {
 ProcessRecord proc = mPidsSelfLocked . get ( pids [ i ] ) ;
 if ( proc != null ) {
 int type = proc . setAdj ;
 - types [ i ] = type ;
 if ( type > worstType ) {
 worstType = type ;
 }


<nb> public class EncodingManagerTest
 assertTrue ( false ) ;
 } catch ( Exception ex )
 {
 - assertEquals ( STRING0 ,
 - ex . getMessage ( ) ) ;
 + assertTrue ( ex . getMessage ( ) , ex . getMessage ( ) . startsWith ( STRING1 ) ) ;
 }
 }


<nb> public class Cache < K , V > {
 final K key ;
 final V value ;
 long writeTime ;
 - long accessTime ;
 + volatile long accessTime ;
 Entry < K , V > before ;
 Entry < K , V > after ;
 State state = State . NEW ;