<nb> class InOrderVerifier implements InOrder {
 if ( ! mocksToBeVerifiedInOrder . contains ( mock ) ) {
 reporter . inOrderRequiresFamiliarMock ( ) ;
 }
 - SINGLE
 - SINGLE
 - SINGLE
 if ( mode instanceof MockitoVerificationMode ) {
 return Mockito . verify ( mock , new MockitoInOrderVerificationMode ( ( MockitoVerificationMode ) mode , mocksToBeVerifiedInOrder ) ) ;
 }
 - return Mockito . verify ( mock , mode ) ;
 + throw new RuntimeException ( STRING0 ) ;
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 }
 }


<nb> public final class ActFmSyncService {
 }

 if ( values . containsKey ( TagData . DELETION_DATE . name ) ) {
 - params . add ( STRING0 ) ; params . add ( tagData . getValue ( TagData . DELETION_DATE ) ) ;
 + params . add ( STRING0 ) ; params . add ( tagData . getValue ( TagData . DELETION_DATE ) / NUMBER0 ) ;
 }

 if ( values . containsKey ( TagData . TAG_DESCRIPTION . name ) ) {

Should send tag deletion date to server in seconds


<nb> public abstract class AbstractClient implements ShellClient
 if ( this . console == null )
 {
 System . out . println ( STRING0 +
 - STRING1 ) ;
 + STRING2 ) ;
 this . console = new StandardConsole ( ) ;
 }
 this . getOutput ( ) . println ( ) ;

Clarified jLine included current http link


<nb> public interface LatentMatcher < T > {

 SINGLE

 + COMMENT
 + COMMENT
 + COMMENT
 class ForFieldToken implements LatentMatcher < FieldDescription > {

 + COMMENT
 + COMMENT
 + COMMENT
 private final FieldDescription . Token token ;

 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 public ForFieldToken ( FieldDescription . Token token ) {
 this . token = token ;
 }
 <nb> public interface LatentMatcher < T > {
 }
 }

 + COMMENT
 + COMMENT
 + COMMENT
 class ForMethodToken implements LatentMatcher < MethodDescription > {

 + COMMENT
 + COMMENT
 + COMMENT
 private final MethodDescription . Token token ;

 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 public ForMethodToken ( MethodDescription . Token token ) {
 this . token = token ;
 }


<nb> public class View implements Drawable . Callback , KeyEvent . Callback ,
 @ nullable
 public ColorStateList getForegroundTintList ( ) {
 return mForegroundInfo != null && mForegroundInfo . mTintInfo != null
 - ? mBackgroundTint . mTintList : null ;
 + ? mForegroundInfo . mTintInfo . mTintList : null ;
 }

 COMMENT


<nb> public class CompletionVariant {
 ret . setAttribute ( key , myItemProperties . get ( key ) ) ;
 }
 }
 - final Pattern pattern = CompletionUtil . createCampelHumpsMatcher ( prefix ) ;
 - PatternMatcher matcher = new Perl5Matcher ( ) ;
 +
 final String lookupString = ret . getLookupString ( ) ;
 - if ( CompletionUtil . checkName ( lookupString , prefix , caseInsensitive ) || matcher . matches ( lookupString , pattern ) ) {
 + if ( CompletionUtil . checkName ( lookupString , prefix , caseInsensitive ) ) {
 set . add ( ret ) ;
 return ret ;
 + } else {
 + final Pattern pattern = CompletionUtil . createCampelHumpsMatcher ( prefix ) ;
 + PatternMatcher matcher = new Perl5Matcher ( ) ;
 +
 + if ( matcher . matches ( lookupString , pattern ) ) {
 + set . add ( ret ) ;
 + return ret ;
 + }
 }
 return null ;
 }

using Perl matcher only when simple prefix based maching fails


<nb> public class Indexer {
 try {
 client . admin ( ) . cluster ( ) . health ( new ClusterHealthRequest ( ) . waitForYellowStatus ( ) ) . actionGet ( NUMBER0 , TimeUnit . SECONDS ) ;
 } catch ( ElasticSearchTimeoutException e ) {
 - UI . exitHardWithWall ( STRING0 , new String [ ] { STRING1 } ) ;
 + UI . exitHardWithWall ( STRING0 , new String [ ] { STRING2 } ) ;
 }

 -
 Runtime . getRuntime ( ) . addShutdownHook ( new Thread ( ) {
 @ override
 public void run ( ) {

fix elasticsearch connection KB help link


<nb> public class ProxyTunnellingTest
 try
 {
 ContentExchange exchange = new ContentExchange ( true ) ;
 - exchange . setTimeout ( NUMBER0 ) ;
 + SINGLE
 + exchange . setTimeout ( NUMBER1 ) ;
 exchange . setURL ( STRING0 ) ;
 httpClient . send ( exchange ) ;
 assertEquals ( HttpExchange . STATUS_COMPLETED , exchange . waitForDone ( ) ) ;


<nb> public class NameVirtualHostHandler implements HttpHandler {
 final HttpHandler handler = hosts . get ( host . getFirst ( ) ) ;
 if ( handler != null ) {
 HttpHandlers . executeHandler ( handler , exchange , completionHandler ) ;
 + return ;
 }
 }
 HttpHandlers . executeHandler ( defaultHandler , exchange , completionHandler ) ;


<nb> public abstract class ServiceBase extends Service {
 return new Preferences ( this ) ;
 }

 - protected void acquireLocks ( ) {
 + protected synchronized void acquireLocks ( ) {
 if ( mWakeLock == null ) {
 PowerManager pMgr = ( PowerManager ) getSystemService ( POWER_SERVICE ) ;
 mWakeLock = pMgr . newWakeLock ( wakeLockType ( ) , TAG ) ;
 <nb> public abstract class ServiceBase extends Service {
 WifiManager . WIFI_MODE_FULL_HIGH_PERF : WifiManager . WIFI_MODE_FULL ;
 }

 - protected void releaseLocks ( ) {
 + protected synchronized void releaseLocks ( ) {
 if ( mWakeLock != null && mWakeLock . isHeld ( ) ) {
 mWakeLock . release ( ) ;
 mWakeLock = null ;


<nb> public abstract class SpellCheckerService extends Service {
 }
 wordStart = wordIterator . getBeginning ( wordEnd ) ;
 }
 - if ( originalText . length ( ) >= SpellChecker . WORD_ITERATOR_INTERVAL
 - && wordItems . size ( ) >= NUMBER0 ) {
 - if ( DBG ) {
 - Log . w ( TAG , STRING0
 - + wordItems . get ( NUMBER1 ) . mTextInfo . getText ( ) ) ;
 - }
 - wordItems . remove ( NUMBER1 ) ;
 - }
 return new SentenceTextInfoParams ( originalTextInfo , wordItems ) ;
 }

Spell check the first word of the sentence


<nb> public class ShadowCountDownTimer {
 public boolean hasStarted ( ) {
 return started ;
 }
 +
 + public long getCountDownInterval ( ) {
 + return countDownInterval ;
 + }
 +
 + public long getMillisInFuture ( ) {
 + return millisInFuture ;
 + }
 }
 <nb> public class CountDownTimerTest {
 shadowCountDownTimer . cancel ( ) ;
 assertThat ( shadowCountDownTimer . hasStarted ( ) , equalTo ( false ) ) ;
 }
 +
 + @ test
 + public void testAccessors ( ) {
 + assertThat ( shadowCountDownTimer . getCountDownInterval ( ) , equalTo ( countDownInterval ) ) ;
 + assertThat ( shadowCountDownTimer . getMillisInFuture ( ) , equalTo ( millisInFuture ) ) ;
 + }
 }

Add accessors for countdown interval millis in future for use in assertions


<nb> public abstract class AbstractApplicationContext extends DefaultResourceLoader
 COMMENT
 protected void invokeBeanFactoryPostProcessors ( ConfigurableListableBeanFactory beanFactory ) {
 PostProcessorRegistrationDelegate . invokeBeanFactoryPostProcessors ( beanFactory , getBeanFactoryPostProcessors ( ) ) ;
 +
 + SINGLE
 + SINGLE
 + if ( beanFactory . getTempClassLoader ( ) == null && beanFactory . containsBean ( LOAD_TIME_WEAVER_BEAN_NAME ) ) {
 + beanFactory . addBeanPostProcessor ( new LoadTimeWeaverAwareProcessor ( beanFactory ) ) ;
 + beanFactory . setTempClassLoader ( new ContextTypeMatchClassLoader ( beanFactory . getBeanClassLoader ( ) ) ) ;
 + }
 }

 COMMENT

Detect LoadTimeWeaver bean when declared through Bean method as well


<nb> public abstract class TextFieldCompletionProvider implements TextCompletionProvi

 @ notnull
 public EditorTextField createEditor ( Project project ) {
 - return createEditor ( project , true ) ;
 - }
 -
 - @ notnull
 - public EditorTextField createEditor ( Project project , final boolean shouldHaveBorder ) {
 - return createEditor ( project , shouldHaveBorder , null ) ;
 + return createEditor ( project , true , null ) ;
 }

 @ notnull


<nb> public class ScaleGestureDetector {
 mInputEventConsistencyVerifier . onTouchEvent ( event , NUMBER0 ) ;
 }

 + mCurrTime = event . getEventTime ( ) ;
 +
 final int action = event . getActionMasked ( ) ;

 final boolean streamComplete = action == MotionEvent . ACTION_UP ||
 <nb> public class ScaleGestureDetector {
 mPrevSpanX = mCurrSpanX = spanX ;
 mPrevSpanY = mCurrSpanY = spanY ;
 mPrevSpan = mCurrSpan = span ;
 + mPrevTime = mCurrTime ;
 mInProgress = mListener . onScaleBegin ( this ) ;
 }

 <nb> public class ScaleGestureDetector {
 mPrevSpanX = mCurrSpanX ;
 mPrevSpanY = mCurrSpanY ;
 mPrevSpan = mCurrSpan ;
 + mPrevTime = mCurrTime ;
 }
 }

Fix time related ScaleGestureDetector methods


<nb> public class VerificationCollectorImplTest {
 assertThat ( result . getFailures ( ) . get ( NUMBER0 ) . getMessage ( ) ) . contains ( STRING0 ) ;
 }

 - @ ignore ( STRING1 )
 + SINGLE
 public static class VerificationCollectorRuleInner {

 @ rule

Removed the Ignore tag that was added with the last build as it causes the build to fail


<nb> public class GlyphLayout implements Poolable {
 char ch = str . charAt ( i ) ;
 if ( ch == STRING0 ) {
 if ( i < start + NUMBER0 || i > start + NUMBER1 ) break ; SINGLE
 + if ( i - start <= NUMBER2 ) { SINGLE
 + for ( int ii = NUMBER3 , nn = NUMBER1 - ( i - start ) ; ii < nn ; ii ++ )
 + colorInt = colorInt < < NUMBER4 ;
 + colorInt |= NUMBER5 ;
 + }
 Color color = colorPool . obtain ( ) ;
 colorStack . add ( color ) ;
 Color . rgba8888ToColor ( color , colorInt ) ;
 - if ( i <= start + NUMBER2 ) color . a = FLOAT0 ; SINGLE
 return i - start ;
 }
 if ( ch >= STRING1 && ch <= STRING2 )

Fixed color parsing when RRGGBB or fewer chars


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class PyCharmEduInitialConfigurator {
 uiSettings . SHOW_MAIN_TOOLBAR = false ;
 codeInsightSettings . REFORMAT_ON_PASTE = CodeInsightSettings . NO_REFORMAT ;

 + Registry . get ( STRING0 ) . setValue ( true ) ;
 +
 GeneralSettings . getInstance ( ) . setShowTipsOnStartup ( false ) ;

 EditorSettingsExternalizable . getInstance ( ) . setVirtualSpace ( false ) ;


<nb> public final class WebSubsystemElement extends AbstractSubsystemElement < WebSubsy
 host . writeContent ( streamWriter ) ;
 }
 }
 + streamWriter . writeEndElement ( ) ;
 }

 WebConnectorElement addConnector ( final String name ) {


<nb> public final class MapMaker extends GenericMapMaker < Object , Object > {
 COMMENT
 COMMENT
 COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public final class MapMaker extends GenericMapMaker < Object , Object > {
 COMMENT
 COMMENT
 COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public final class MapMaker extends GenericMapMaker < Object , Object > {
 COMMENT
 COMMENT
 COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT

document the difference between makeComputingMap and makeCache


<nb> package NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - public interface Bat extends Ambient { }
 + public interface Bat extends Ambient {
 +
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + boolean isAwake ( ) ;
 +
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + void setAwake ( boolean state ) ;
 + }


<nb> import NAMESPACE ;
 import NAMESPACE ;

 class LeafBlockWrapper extends AbstractBlockWrapper {
 - SINGLE
 private static int CONTAIN_LINE_FEEDS = NUMBER0 ;
 private static int READ_ONLY = NUMBER1 ;
 private static int LEAF = NUMBER2 ;
 <nb> class LeafBlockWrapper extends AbstractBlockWrapper {
 private LeafBlockWrapper myNextBlock ;
 private SpacingImpl mySpaceProperty ;
 private IndentInside myLastLineIndent ;
 - private CharSequence myText ;

 public LeafBlockWrapper ( final Block block ,
 CompositeBlockWrapper parent ,
 <nb> class LeafBlockWrapper extends AbstractBlockWrapper {
 myLastLineIndent = null ;
 }

 - myText = model . getText ( getTextRange ( ) ) ;
 -
 myFlags = flagsValue ;
 }

 <nb> class LeafBlockWrapper extends AbstractBlockWrapper {
 return new TextRange ( myStart , myEnd ) ;
 }

 -
 - @ override
 - public String toString ( ) {
 - return myText . toString ( ) ;
 - }
 }


<nb> public class ContentView extends FrameLayout {
 boolean isLinkBubblePresent = false ;
 SINGLE
 for ( AppForUrl info : mAppsForUrl ) {
 +
 + SINGLE
 + if ( info . mResolveInfo == null || info . mResolveInfo . activityInfo == null ) {
 + CrashTracking . log ( STRING0 + info ) ;
 + continue ;
 + }
 +
 if ( info . mResolveInfo . activityInfo . packageName . startsWith ( STRING1 ) ) {
 isLinkBubblePresent = true ;
 break ;

Handle null resolveInfo crash in ContentView


<nb> import static NAMESPACE ;
 COMMENT
 public final class ConnectionSpec {

 - SINGLE
 + SINGLE
 SINGLE
 SINGLE
 private static final CipherSuite [ ] APPROVED_CIPHER_SUITES = new CipherSuite [ ] {
 <nb> public final class ConnectionSpec {
 CipherSuite . TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA ,
 CipherSuite . TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA ,
 CipherSuite . TLS_DHE_RSA_WITH_AES_128_CBC_SHA ,
 - CipherSuite . TLS_DHE_DSS_WITH_AES_128_CBC_SHA ,
 CipherSuite . TLS_DHE_RSA_WITH_AES_256_CBC_SHA ,
 CipherSuite . TLS_RSA_WITH_AES_128_GCM_SHA256 ,
 CipherSuite . TLS_RSA_WITH_AES_128_CBC_SHA ,


<nb> public class ChunkIconsManager
 Position pos = toDocumentPosition ( el , editor ) ;
 String text = editor . getSession ( ) . getLine ( pos . getRow ( ) ) ;

 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + String lower = text . toLowerCase ( ) . trim ( ) ;
 + if ( lower . startsWith ( STRING0 ) )
 + {
 + Pattern reREngine = Pattern . create ( STRING1 , STRING2 ) ;
 + if ( ! reREngine . test ( lower ) )
 + return false ;
 + }
 +
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 Pattern pattern = Pattern . create ( STRING3 , STRING2 ) ;
 Match match = pattern . match ( text , NUMBER0 ) ;


<nb> public class TvShowCollection implements AdapteeCollection < TvShow > , Serializable
 }

 @ override public void removeAll ( Collection < TvShow > tvShows ) {
 - this . tvShows . addAll ( tvShows ) ;
 + this . tvShows . removeAll ( tvShows ) ;
 }

 public void clear ( ) {

Fix bug related with addAll method in TvShowCollection


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> import NAMESPACE ;
 public class SvnCheckinEnvironment implements CheckinEnvironment {
 private final SvnVcs mySvnVcs ;

 - public boolean showCheckinDialogInAnyCase ( ) {
 - return false ;
 - }
 -
 public SvnCheckinEnvironment ( SvnVcs svnVcs ) {
 mySvnVcs = svnVcs ;
 }
 <nb> public class SvnCheckinEnvironment implements CheckinEnvironment {
 return null ;
 }

 - public String prepareCheckinMessage ( String text ) {
 - return text ;
 - }
 -
 @ nullable
 public String getHelpId ( ) {
 return null ;
 <nb> public class SvnCheckinEnvironment implements CheckinEnvironment {
 return exceptions ;
 }

 + public boolean keepChangeListAfterCommit ( ChangeList changeList ) {
 + return false ;
 + }
 +
 private class KeepLocksComponent implements RefreshableOnComponent {
 private JCheckBox myKeepLocksBox ;
 private boolean myIsKeepLocks ;

remove unused CheckinEnvironment methods add keepChangeListAfterCommit method


<nb> public class MBeanFactory {
 String defaultHost , String baseDir ) throws Exception {

 if ( ! ( container instanceof Server ) ) {
 - throw new Exception ( ) ;
 + throw new Exception ( STRING0 ) ;
 }

 StandardEngine engine = new StandardEngine ( ) ;


<nb> public class Glide {
 }

 @ override
 - public void onResourceReady ( Object resource , GlideAnimation < Object > glideAnimation ) {
 + public void onResourceReady ( Object resource , GlideAnimation < ? super Object > glideAnimation ) {
 SINGLE
 }


<nb> public class PeerGroup extends AbstractIdleService {
 ExecutorService workerExecutor = Executors . newCachedThreadPool ( new PeerGroupThreadFactory ( ) ) ;
 NioClientSocketChannelFactory channelFactory = new NioClientSocketChannelFactory ( bossExecutor , workerExecutor ) ;
 ClientBootstrap bs = new ClientBootstrap ( channelFactory ) ;
 - bs . setOption ( STRING0 , NUMBER0 ) ;
 + bs . setOption ( STRING1 , NUMBER0 ) ;
 return bs ;
 }

Fix typo that prevented connection timeouts from being set properly


<nb> public class ID3Reader {
 COMMENT
 protected void skipBytes ( InputStream input , int number ) throws IOException {
 int skipped = NUMBER0 ;
 + if ( number <= NUMBER0 ) {
 + number = NUMBER1 ;
 + }
 while ( skipped < number ) {
 skipped += input . skip ( number - skipped ) ;
 }


<nb> import NAMESPACE ;

 public class ReturnsVoid implements Answer < Object > {

 - @ override
 public Object answer ( InvocationOnMock invocation ) throws Throwable {
 return null ;
 }


<nb> public class ConversationFragment extends Fragment {
 conversation , timestamp ) ;
 messageList . clear ( ) ;
 messageList . addAll ( conversation . getMessages ( ) ) ;
 + updateStatusMessages ( ) ;
 messageListAdapter . notifyDataSetChanged ( ) ;
 if ( size != NUMBER0 ) {
 messagesLoaded = true ;

added missing status messages after message scroll


<nb> public class DatabaseBackend extends SQLiteOpenHelper {
 + AxolotlService . SQLiteAxolotlStore . ACCOUNT + STRING0
 + AxolotlService . SQLiteAxolotlStore . NAME + STRING1
 + AxolotlService . SQLiteAxolotlStore . OWN + STRING2
 - + AxolotlService . SQLiteAxolotlStore . FINGERPRINT + STRING3
 + + AxolotlService . SQLiteAxolotlStore . FINGERPRINT + STRING1
 + AxolotlService . SQLiteAxolotlStore . TRUSTED + STRING2
 + AxolotlService . SQLiteAxolotlStore . KEY + STRING4
 + AxolotlService . SQLiteAxolotlStore . ACCOUNT
 - + STRING5 + Account . TABLENAME + STRING6 + Account . UUID + STRING7
 + + STRING5 + Account . TABLENAME + STRING6 + Account . UUID + STRING8
 + + STRING9 + AxolotlService . SQLiteAxolotlStore . ACCOUNT + STRING10
 + + AxolotlService . SQLiteAxolotlStore . NAME + STRING10
 + + AxolotlService . SQLiteAxolotlStore . FINGERPRINT
 + + STRING11
 + STRING12 ;

 private DatabaseBackend ( Context context ) {


<nb> public class OldIndexBackwardsCompatibilityTests extends ElasticsearchIntegratio
 assertAcked ( client ( ) . admin ( ) . indices ( ) . prepareUpdateSettings ( indexName ) . setSettings ( ImmutableSettings . builder ( )
 . put ( STRING0 , numReplicas )
 ) . execute ( ) . actionGet ( ) ) ;
 - ensureGreen ( TimeValue . timeValueMinutes ( NUMBER0 ) , indexName ) ;
 + ensureGreen ( TimeValue . timeValueMinutes ( NUMBER1 ) , indexName ) ;
 logger . debug ( STRING1 , indexName , TimeValue . timeValueMillis ( System . currentTimeMillis ( ) - startTime ) ) ;
 logger . debug ( STRING2 , XContentHelper . toString ( client ( ) . admin ( ) . indices ( ) . prepareRecoveries ( indexName ) . get ( ) ) ) ;

increasing timeout for replicas in static bwc tests to account


<nb> public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
 }
 }
 if ( compatibleMediaTypes . isEmpty ( ) ) {
 - throw new HttpMediaTypeNotAcceptableException ( allSupportedMediaTypes ) ;
 + throw new HttpMediaTypeNotAcceptableException ( producibleMediaTypes ) ;
 }

 List < MediaType > mediaTypes = new ArrayList < MediaType > ( compatibleMediaTypes ) ;

Fix exception message about producible media types


<nb> public class EditRolePermissionsAction extends PortletAction {
 String modelResource = ParamUtil . getString ( req , STRING0 ) ;

 String selResource = modelResource ;
 +
 if ( Validator . isNull ( modelResource ) ) {
 selResource = portletResource ;
 }


<nb> public class DhnsGraphController implements GraphController {
 public Dhns newDhns ( Workspace workspace ) {
 Dhns dhns = new Dhns ( this ) ;
 workspace . getWorkspaceData ( ) . setData ( workspaceDataProvider . getWorkspaceDataKey ( ) , dhns ) ;
 - dhns . setCentralDynamicGraph ( new DynamicGraphImpl ( dhns , getClusteredDirectedGraph ( ) ) ) ;
 + dhns . setCentralDynamicGraph ( new DynamicGraphImpl ( dhns , getHierarchicalDirectedGraph ( ) ) ) ;
 return dhns ;
 }

 <nb> public class DynamicGraphImpl < T extends Graph > implements DynamicGraph {
 FilteredGraph filteredGraph = ( FilteredGraph ) graph ;
 filteredGraph . addNodePredicate ( new DynamicNodePredicate ( ) ) ;
 filteredGraph . addEdgePredicate ( new DynamicEdgePredicate ( ) ) ;
 + filteredGraph = ( FilteredGraph ) ( ( ClusteredGraphImpl ) graph ) . getClusteredGraph ( ) ;
 + filteredGraph . addNodePredicate ( new DynamicNodePredicate ( ) ) ;
 + filteredGraph . addEdgePredicate ( new DynamicEdgePredicate ( ) ) ;
 }

 public void setRange ( float from , float to ) {


<nb> public class IQAuthHandler extends IQHandler implements IQAuthInfo {
 }
 SINGLE
 else {
 - if ( iq . elements ( ) . isEmpty ( ) ) {
 + if ( query . elements ( ) . isEmpty ( ) ) {
 SINGLE
 response = anonymousLogin ( session , packet ) ;
 }


<nb>
 COMMENT
 package NAMESPACE ;

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

 + import NAMESPACE ;
 import NAMESPACE ;

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

 -
 public class ElasticsearchConfigurationTest {
 @ test
 public void testGetElasticSearchIndexPrefix ( ) throws RepositoryException , ValidationException {
 <nb> public class ElasticsearchConfigurationTest {

 @ test
 public void testIsClientNode ( ) throws ValidationException , RepositoryException {
 - final Map < String , String > props = Maps . newHashMap ( ) ;
 + final Map < String , String > props = new HashMap < > ( ) ;
 final ElasticsearchConfiguration configuration1 = new ElasticsearchConfiguration ( ) ;

 new JadConfig ( new InMemoryRepository ( ) , configuration1 ) . process ( ) ;

Fix wrong Maps import in ElasticsearchConfiguration


<nb> public class ODatabaseRecordThreadLocal extends ThreadLocal < ODatabaseRecord > {
 throw new ODatabaseException (
 STRING0 ) ;
 } else {
 - db = Orient . instance ( ) . getDatabaseThreadFactory ( ) . getDb ( ) ;
 + db = Orient . instance ( ) . getDatabaseThreadFactory ( ) . getThreadDatabase ( ) ;
 if ( db == null ) {
 throw new ODatabaseException (
 STRING0 ) ;
 <nb> public class DatabaseThreadFactoryTest {
 Orient . instance ( ) . registerThreadDatabaseFactory ( new ODatabaseThreadLocalFactory ( ) {

 @ override
 - public ODatabaseRecord getDb ( ) {
 + public ODatabaseRecord getThreadDatabase ( ) {
 return ODatabaseDocumentPool . global ( ) . acquire ( url , STRING1 , STRING1 ) ;
 }
 } ) ;


<nb> public class HttpPanelSplitUi extends AbstractPanel {
 }

 private void setDisplayRequest ( HttpMessage msg ) {
 - String header = replaceHeaderForZapTextArea ( msg . getRequestHeader ( ) . toString ( ) ) ;
 - String body = msg . getRequestBody ( ) . toString ( ) ;
 + final String header = replaceHeaderForZapTextArea ( msg . getRequestHeader ( ) . toString ( ) ) ;
 + final String body = msg . getRequestBody ( ) . toString ( ) ;

 - getHttpPanelTabularModel ( ) . setText ( msg . getRequestBody ( ) . toString ( ) ) ;
 + getHttpPanelTabularModel ( ) . setText ( body ) ;

 getTxtHeader ( ) . setText ( header ) ;
 getTxtHeader ( ) . setCaretPosition ( NUMBER0 ) ;


<nb> public class PresencePanel
 presenceOpPanel . setBorder ( BorderFactory . createTitledBorder (
 Resources . getString ( STRING0 ) ) ) ;

 + xCapEnableBox . setSelected ( regform . getRegistration ( ) . isXCapEnable ( ) ) ;
 xCapEnableBox . addActionListener ( new ActionListener ( )
 {
 public void actionPerformed ( ActionEvent evt )
 <nb> public class PresencePanel
 = new TransparentPanel ( new BorderLayout ( NUMBER0 , NUMBER0 ) ) ;
 xCapServerUriPanel . add ( xCapServerUriLabel , BorderLayout . WEST ) ;
 xCapServerUriPanel . add ( xCapServerUriValue , BorderLayout . CENTER ) ;
 + String xcapUri = regform . getRegistration ( ) . getXCapServerUri ( ) ;
 + if ( xcapUri != null )
 + xCapServerUriValue . setText ( xcapUri ) ;

 xCapButtonsPanel . add ( xCapEnableBox ) ;
 xCapButtonsPanel . add ( xCapServerUriPanel ) ;

Correctly set the default values of the xcap fields form stays the same for the user


<nb> import NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - @ serviceprovider ( service = StatisticsUI . class )
 + SINGLE
 public class HitsUI implements StatisticsUI {

 private final StatSettings settings = new StatSettings ( ) ;


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public abstract class StackValue {
 }

 public static void putUnitInstance ( InstructionAdapter v ) {
 - v . visitFieldInsn ( GETSTATIC , UNIT_TYPE . getInternalName ( ) , STRING0 , UNIT_TYPE . getDescriptor ( ) ) ;
 + v . visitFieldInsn ( GETSTATIC , UNIT_TYPE . getInternalName ( ) , JvmAbi . INSTANCE_FIELD , UNIT_TYPE . getDescriptor ( ) ) ;
 }

 protected void putAsBoolean ( InstructionAdapter v ) {

fixed the getting Unit instance Unit VALUE Unit instance


<nb> import NAMESPACE ;
 double earthRadius = FLOAT0 ; SINGLE
 int radius = NUMBER0 ; SINGLE

 - if ( cell . getLat ( ) != FLOAT1 && cell . getLon ( ) != FLOAT1 ) {
 + if ( Double . doubleToRawLongBits ( cell . getLat ( ) ) != NUMBER1 &&
 + Double . doubleToRawLongBits ( cell . getLon ( ) ) != NUMBER1 ) {
 SINGLE
 GeoLocation currentLoc = GeoLocation . fromDegrees ( cell . getLat ( ) , cell . getLon ( ) ) ;

 <nb> import NAMESPACE ;
 . setNegativeButton ( R . string . open_cell_id_button_cancel , new DialogInterface . OnClickListener ( ) {
 @ override
 public void onClick ( DialogInterface dialog , int which ) {
 - SINGLE
 }
 } )
 . setPositiveButton ( R . string . open_cell_id_button_ok , new DialogInterface . OnClickListener ( ) {


<nb> public class PostsAndPagesAdapter extends ArrayAdapter < SingleItemModel > {
 StatsViewHolder holder = ( StatsViewHolder ) rowView . getTag ( ) ;
 holder . setEntryTextOrLink ( currentRowData . getUrl ( ) , currentRowData . getTitle ( ) ) ;

 + holder . imgMore . setVisibility ( View . GONE ) ;
 +
 SINGLE
 holder . totalsTextView . setText ( FormatUtils . formatDecimal ( currentRowData . getTotals ( ) ) ) ;

Do not show the Follow button in Followers email


<nb> public class BaseBinarySpec extends AbstractBuildableModelElement implements Bin
 this . tasks = info . instantiator . newInstance ( DefaultBinaryTasksCollection . class , this , info . taskFactory ) ;

 sources = ModelMaps . addModelMapNode ( modelNode , LanguageSourceSet . class , STRING0 ) ;
 + namingScheme = DefaultBinaryNamingScheme . component ( componentName ( ) ) . withBinaryName ( name ) . withBinaryType ( getTypeName ( ) ) ;
 + }
 +
 + @ nullable
 + private String componentName ( ) {
 ComponentSpec component = getComponent ( ) ;
 - namingScheme = DefaultBinaryNamingScheme . component ( component == null ? null : component . getName ( ) ) . withBinaryName ( name ) . withBinaryType ( getTypeName ( ) ) ;
 + return component != null ? component . getName ( ) : null ;
 }

 @ override


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

 <nb> public class EasyConfigMod {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 public EasyConfigMod ( final Context context ) {
 this . context = context ;
 <nb> public class EasyConfigMod {

 return String . format ( Locale . US , STRING0 , hr , min , sec ) ;
 }
 +
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + public static boolean hasSdCard ( ) {
 + return Environment . MEDIA_MOUNTED . equals ( Environment . getExternalStorageState ( ) ) ;
 + }
 }
 +


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

 import NAMESPACE ;
 <nb> public class ThemeBrowserFragment extends Fragment implements OnItemClickListene
 mListView = ( HeaderGridView ) view . findViewById ( R . id . theme_listview ) ;
 View header = inflater . inflate ( R . layout . theme_grid_cardview_header , null ) ;
 mListView . addHeaderView ( header ) ;
 + SearchView searchView = new SearchView ( getActivity ( ) ) ;
 + mListView . addHeaderView ( searchView ) ;
 mListView . setRecyclerListener ( this ) ;

 SINGLE


<nb> package NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class IpnbConfigurable implements SearchableConfigurable {
 @ override
 public boolean isModified ( ) {
 final String oldUrl = IpnbSettings . getInstance ( myProject ) . getURL ( ) ;
 - final String url = myFieldUrl . getText ( ) ;
 + final String url = StringUtil . trimEnd ( myFieldUrl . getText ( ) , STRING0 ) ;
 return ! url . equals ( oldUrl ) ;
 }

 @ override
 public void apply ( ) throws ConfigurationException {
 - IpnbSettings . getInstance ( myProject ) . setURL ( myFieldUrl . getText ( ) ) ;
 + String url = myFieldUrl . getText ( ) ;
 + url = StringUtil . trimEnd ( url , STRING0 ) ;
 + IpnbSettings . getInstance ( myProject ) . setURL ( url ) ;
 }

 @ override

slash at the end of the URL prevents cells from running


<nb> public class MavenProjectsCreator {
 }

 private Set < MavenProject > createNow ( Settings settings , File pomFile ) throws PlexusContainerException , PlexusConfigurationException , ComponentLookupException , MavenExecutionRequestPopulationException , ProjectBuildingException {
 - SINGLE
 - SINGLE
 - SINGLE
 ContainerConfiguration containerConfiguration = new DefaultContainerConfiguration ( )
 . setClassWorld ( new ClassWorld ( STRING0 , ClassWorld . class . getClassLoader ( ) ) )
 . setName ( STRING1 ) ;


<nb> public class ConnectorTableLayout
 }

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


<nb> public class ZLoop
 }
 }
 }
 - zombies . clear ( ) ;
 SINGLE
 timers . addAll ( newTimers ) ;
 newTimers . clear ( ) ;

Revert clear zombies after they are removed from timer list


<nb> public class WorkDuration implements Serializable {
 workingDays += nbAdditionalDays ;
 workingHours = hours - ( nbAdditionalDays * hoursInDay ) ;
 }
 - return workingDays * DAY_POSITION_IN_LONG + workingHours * HOUR_POSITION_IN_LONG + minutes * MINUTE_POSITION_IN_LONG ;
 + return NUMBER0 * workingDays * DAY_POSITION_IN_LONG + workingHours * HOUR_POSITION_IN_LONG + minutes * MINUTE_POSITION_IN_LONG ;
 }

 public long toMinutes ( ) {


<nb>
 COMMENT
 package NAMESPACE ;

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

 COMMENT
 COMMENT
 <nb> public class SipProtocolProviderServiceLick

 SipSlickFixture . bc = context ;

 - addTestSuite ( TestAccountInstallation . class ) ;
 + SINGLE
 + SINGLE
 + SINGLE
 + addTestSuite ( TestAccountUninstallationPersistence . class ) ;

 context . registerService ( getClass ( ) . getName ( ) , this , properties ) ;
 }
 <nb> public class SipProtocolProviderServiceLick
 COMMENT
 public void stop ( BundleContext context )
 {
 +
 }
 }

temporarily remove some test methods as tested material is still unstable and i needed to commit for backup purposes


<nb> public class ZeppelinServer extends Application {
 final ServletHolder SwaggerServlet = new ServletHolder ( new com . wordnik . swagger . jersey . config . JerseyJaxrsConfig ( ) ) ;
 SwaggerServlet . setName ( STRING0 ) ;
 SwaggerServlet . setInitParameter ( STRING1 , STRING2 ) ;
 - SwaggerServlet . setInitParameter ( STRING3 , STRING4 + port + STRING5 ) ;
 + SwaggerServlet . setInitParameter ( STRING3 , STRING4 + port + STRING6 ) ;
 SwaggerServlet . setInitOrder ( NUMBER0 ) ;

 SINGLE

Change zeppelin rest api endpoint in swagger core


<nb> public class XMLConfigWithSystemPropertyTest {
 public void testConfigurationWithFile ( ) throws Exception {
 URL url = getClass ( ) . getClassLoader ( ) . getResource ( STRING0 ) ;
 assertNotNull ( url ) ;
 - System . setProperty ( STRING1 , URLDecoder . decode ( url . getPath ( ) , STRING2 ) ) ;
 + String decodedURL = URLDecoder . decode ( url . getPath ( ) , STRING2 ) ;
 + System . setProperty ( STRING1 , decodedURL ) ;
 Config config = new XmlConfigBuilder ( ) . build ( ) ;
 - assertEquals ( url , config . getConfigurationUrl ( ) ) ;
 + URL file = new URL ( STRING3 ) ;
 + URL encodedURL = new URL ( file , decodedURL ) ;
 + assertEquals ( encodedURL , config . getConfigurationUrl ( ) ) ;
 }

 @ test ( expected = HazelcastException . class )

made some changes on testConfigurationWithFile


<nb> public class StudyCheckTask extends com . intellij . openapi . progress . Task . Backgroun
 if ( course . isAdaptive ( ) ) {
 ApplicationManager . getApplication ( ) . invokeLater (
 ( ) - > {
 - StudyCheckUtils . showTestResultPopUp ( STRING0 , MessageType . ERROR . getPopupBackground ( ) , myProject ) ;
 + StudyCheckUtils . showTestResultPopUp ( STRING0 , MessageType . INFO . getPopupBackground ( ) , myProject ) ;
 StudyCheckUtils . showTestResultsToolWindow ( myProject , message , true ) ;
 } ) ;
 }

Minor Fix after check balloon background color


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

 <nb> public class NotificationsManagerImpl extends NotificationsManager implements No
 final NotificationSettings settings = NotificationsConfiguration . getSettings ( groupId ) ;
 NotificationDisplayType type = settings . getDisplayType ( ) ;
 String toolWindowId = NotificationsConfiguration . getNotificationsConfiguration ( ) . getToolWindowId ( groupId ) ;
 - if ( type == NotificationDisplayType . TOOL_WINDOW && toolWindowId == null ) {
 + if ( type == NotificationDisplayType . TOOL_WINDOW &&
 + ( toolWindowId == null || project == null || Arrays . asList ( ToolWindowManager . getInstance ( project ) . getToolWindowIds ( ) ) . contains ( toolWindowId ) ) ) {
 type = NotificationDisplayType . BALLOON ;
 }

when a toolwindow is not available show toolwindow notifications as plain balloons


<nb> public final class From implements Sqlable {

 if ( mLimit != null ) {
 sql . append ( STRING0 ) ;
 + sql . append ( mLimit ) ;
 sql . append ( STRING1 ) ;
 }


<nb> public class Patches {
 public static final boolean SUN_BUG_ID_4503845 = SystemInfo . JAVA_VERSION . indexOf ( STRING0 ) != - NUMBER0 ;

 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT


<nb> public final class NetUtil {
 if ( file . exists ( ) ) {
 BufferedReader in = null ;
 try {
 - in = new BufferedReader ( new FileReader ( STRING0 ) ) ;
 + in = new BufferedReader ( new FileReader ( file ) ) ;
 somaxconn = Integer . parseInt ( in . readLine ( ) ) ;
 logger . debug ( STRING1 , somaxconn ) ;
 } catch ( Exception e ) {


<nb> public abstract class FinderRecursivePanel < T > extends JBSplitter implements Data
 @ override
 public void run ( ) {
 try {
 + final List < T > listItems = getListItems ( ) ;
 +
 SwingUtilities . invokeLater ( new Runnable ( ) {
 @ override
 public void run ( ) {
 - mergeListItems ( myListModel , getListItems ( ) ) ;
 + mergeListItems ( myListModel , listItems ) ;

 if ( myList . getSelectedIndex ( ) < NUMBER0 ) {
 myList . setSelectedIndex ( myListModel . getSize ( ) > oldIndex ? oldIndex : NUMBER0 ) ;

do not perform getListItems in EDT on update


<nb> public class TestBundle extends TestJaxrsBase {
 final Response response = doGet ( uri , queryParams , DEFAULT_HTTP_TIMEOUT_SEC ) ;
 Assert . assertEquals ( response . getStatusCode ( ) , Status . OK . getStatusCode ( ) ) ;
 final String baseJson = response . getResponseBody ( ) ;
 - final BundleJson objFromJson = mapper . readValue ( baseJson , BundleJson . class ) ;
 + final List < BundleJson > objFromJson = mapper . readValue ( baseJson , new TypeReference < List < BundleJson > > ( ) { } ) ;
 + Assert . assertEquals ( objFromJson . size ( ) , NUMBER0 ) ;
 }

 @ test ( groups = STRING0 , enabled = true )

Fix broken bundle jaxrs test after API change


<nb> import NAMESPACE ;

 import NAMESPACE ;

 - import NAMESPACE ;
 -
 public class InstanceIDService extends InstanceIDListenerService {
 @ override
 public void onTokenRefresh ( ) {


<nb> public class LocalSession {
 }

 public void handleCUIInitializationMessage ( String text ) {
 - if ( ! hasCUISupport ( ) ) {
 - setCUISupport ( true ) ;
 - }
 -
 String [ ] split = text . split ( STRING0 ) ;
 if ( split . length > NUMBER0 && split [ NUMBER1 ] . equalsIgnoreCase ( STRING1 ) ) { SINGLE
 + setCUISupport ( true ) ;
 try {
 setCUIVersion ( Integer . parseInt ( split [ NUMBER0 ] ) ) ;
 } catch ( NumberFormatException e ) {

Only enable CUI support when the message is valid


<nb> public class PostsActivity extends WPActionBarActivity implements OnPostSelected
 MenuInflater inflater = getSupportMenuInflater ( ) ;
 inflater . inflate ( R . menu . posts , menu ) ;
 refreshMenuItem = menu . findItem ( R . id . menu_refresh ) ;
 +
 + if ( isPage ) {
 + menu . findItem ( R . id . menu_new_post ) . setTitle ( R . string . new_page ) ;
 + }
 +
 if ( shouldAnimateRefreshButton ) {
 shouldAnimateRefreshButton = false ;
 startAnimatingRefreshButton ( refreshMenuItem ) ;

Set new post page button title in action bar to New Page when in the pages list


<nb> public final class Futures {
 } catch ( CancellationException e ) {
 throw e ;
 } catch ( ExecutionException e ) {
 - throw newWithCause ( UncheckedExecutionException . class , e . getCause ( ) ) ;
 + throw new UncheckedExecutionException ( e . getCause ( ) ) ;
 } catch ( RuntimeException e ) {
 - throw newWithCause ( UncheckedExecutionException . class , e ) ;
 + throw new UncheckedExecutionException ( e ) ;
 }
 }

Call UncheckedExecutionException constructor instead of using reflection


<nb> public class TimetableSnapshot {
 public TimetableSnapshot mutableCopy ( ) {
 TimetableSnapshot ret = new TimetableSnapshot ( ) ;
 ret . timetables = ( HashMap < TableTripPattern , Timetable > ) this . timetables . clone ( ) ;
 - new HashMap < TableTripPattern , Timetable > ( this . timetables ) ;
 return ret ;
 }


<nb> public abstract class InplaceRefactoring {
 final PsiReference reference = ( myEditorFile != null ?
 myEditorFile : myElementToRename . getContainingFile ( ) )
 . findReferenceAt ( myEditor . getCaretModel ( ) . getOffset ( ) ) ;
 - if ( reference != null && ! refs . contains ( reference ) ) {
 + if ( reference != null && reference . isReferenceTo ( myElementToRename ) && ! refs . contains ( reference ) ) {
 refs . add ( reference ) ;
 }
 }

Inplace rename was renaming the wrong references


<nb> public class JCMediaManager implements MediaPlayer . OnPreparedListener , MediaPlay
 }

 public JCMediaPlayerListener lastListener ( ) {
 - if ( listener == null )
 + if ( lastListener == null )
 return null ;
 return lastListener . get ( ) ;
 }


<nb> public class RealmAsyncQueryTests {
 assertEquals ( NUMBER0 , realmResults . size ( ) ) ;

 Realm . asyncQueryExecutor . resume ( ) ;
 + workerThread . keepStrongReference . add ( realmResults ) ;
 }

 SINGLE
 <nb> public class RealmAsyncQueryTests {
 assertFalse ( firstAsync . isValid ( ) ) ;

 populateTestRealm ( workerThread . realm , NUMBER1 ) ;
 + workerThread . keepStrongReference . add ( firstAsync ) ;
 }

 @ test
 <nb> public class RealmAsyncQueryTests {
 }

 Realm . asyncQueryExecutor . resume ( ) ;
 + workerThread . keepStrongReference . add ( realmResults ) ;
 }

 SINGLE
 <nb> public class RealmAsyncQueryTests {
 }
 } ) ;
 Realm . asyncQueryExecutor . resume ( ) ;
 + workerThread . keepStrongReference . add ( allTypesAsync ) ;
 }

 SINGLE


<nb> package NAMESPACE ;

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

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

 public class PostUploadServiceTest extends ServiceTestCase < PostUploadService > {
 protected Context testContext ;
 <nb> public class PostUploadServiceTest extends ServiceTestCase < PostUploadService > {
 }

 SINGLE
 + SINGLE
 + COMMENT
 public void testUploadMalformedPostNullPostId ( ) throws Exception {
 SINGLE
 SQLiteDatabase db = TestUtils . loadDBFromDump ( targetContext , testContext , STRING0 ) ;
 <nb> public class PostUploadServiceTest extends ServiceTestCase < PostUploadService > {
 assertTrue ( STRING1 ,
 cancelCount [ NUMBER0 ] == NUMBER1 && notifyCount [ NUMBER0 ] == NUMBER2 ) ;
 }
 + COMMENT
 }

comment a failing test temporarly won t fix until new editor


<nb> public class JavaMethodsConflictResolver implements PsiConflictResolver {
 if ( method . isVarArgs ( ) ) return ;
 if ( method . getParameterList ( ) . getParametersCount ( ) == argumentsCount ) {
 parametersNumberMatch = true ;
 - break ;
 }
 }
 }


<nb> public class HttpGenerator extends AbstractGenerator
 @ override
 public String toString ( )
 {
 + Buffer header = _header ;
 + Buffer buffer = _buffer ;
 + Buffer content = _content ;
 return String . format ( STRING0 ,
 getClass ( ) . getSimpleName ( ) ,
 _state ,
 - _header == null ? - NUMBER0 : _header . length ( ) ,
 - _buffer == null ? - NUMBER0 : _buffer . length ( ) ,
 - _content == null ? - NUMBER0 : _content . length ( ) ) ;
 + header == null ? - NUMBER0 : header . length ( ) ,
 + buffer == null ? - NUMBER0 : buffer . length ( ) ,
 + content == null ? - NUMBER0 : content . length ( ) ) ;
 }
 }


<nb> import NAMESPACE ;

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

 COMMENT
 <nb> public class RedundantModifierCheck
 TokenTypes . INTERFACE_DEF ,
 TokenTypes . CLASS_DEF } ;
 }
 +
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + public int [ ] getAcceptableTokens ( )
 + {
 + return new int [ ] { } ;
 + }
 +
 + COMMENT
 + public int [ ] getRequiredTokens ( )
 + {
 + return new int [ ] { TokenTypes . MODIFIERS ,
 + TokenTypes . INTERFACE_DEF ,
 + TokenTypes . CLASS_DEF } ;
 + }

 COMMENT
 public void visitToken ( DetailAST aAST )
 <nb> public class RedundantModifierCheck
 SINGLE

 SINGLE
 - SINGLE
 + SINGLE
 SINGLE
 SINGLE
 SINGLE

Prevent user from specifying tokens in a configuration file


<nb>
 COMMENT
 package NAMESPACE ;

 - import NAMESPACE ;
 + SINGLE
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class SMTestProxy extends AbstractTestProxy {
 public List < ? extends SMTestProxy > collectChildren ( ) {
 final List < ? extends SMTestProxy > allChildren = getChildren ( ) ;

 - final List < SMTestProxy > result = Lists . newArrayList ( ) ;
 + final List < SMTestProxy > result = null ; SINGLE

 result . addAll ( allChildren ) ;


<nb> public class ExecutionResult implements Iterable < Map < String , Object > >
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb>
 package NAMESPACE ;

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


<nb> public abstract class Context {
 @ intdef ( flag = true ,
 value = {
 BIND_AUTO_CREATE ,
 - BIND_AUTO_CREATE ,
 BIND_DEBUG_UNBIND ,
 BIND_NOT_FOREGROUND ,
 BIND_ABOVE_CLIENT ,
 BIND_ALLOW_OOM_MANAGEMENT ,
 - BIND_WAIVE_PRIORITY
 + BIND_WAIVE_PRIORITY ,
 + BIND_IMPORTANT ,
 + BIND_ADJUST_WITH_ACTIVITY
 } )
 @ retention ( RetentionPolicy . SOURCE )
 public @ interface BindServiceFlags { }


<nb>
 package NAMESPACE ;

 import NAMESPACE ;
 - import NAMESPACE ;

 import NAMESPACE ;
 import NAMESPACE ;

 + import static NAMESPACE ;
 + import static NAMESPACE ;
 +
 COMMENT
 COMMENT
 COMMENT
 <nb> public enum Style {
 COMMENT
 COMMENT
 public static Style getByChar ( String code ) {
 - Validate . notNull ( code , STRING0 ) ;
 - Validate . isTrue ( code . length ( ) > NUMBER0 , STRING1 ) ;
 + checkNotNull ( code ) ;
 + checkArgument ( ! code . isEmpty ( ) , STRING2 ) ;

 return BY_CHAR . get ( code . charAt ( NUMBER0 ) ) ;
 }


<nb> public class IntentForwarderActivity extends Activity {
 String resolvedType = newIntent . resolveTypeIfNeeded ( getContentResolver ( ) ) ;
 boolean canForward = false ;
 try {
 - canForward = ipm . canForwardTo ( newIntent , resolvedType , callingUserId ,
 + Intent selector = newIntent . getSelector ( ) ;
 + if ( selector == null ) {
 + selector = newIntent ;
 + }
 + canForward = ipm . canForwardTo ( selector , resolvedType , callingUserId ,
 userDest . getIdentifier ( ) ) ;
 } catch ( RemoteException e ) {
 Slog . e ( TAG , STRING0 ) ;

Using the selector to check if an intent can be forwarded


<nb> THIS SOFTWARE , EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE .
 package NAMESPACE ;

 import NAMESPACE ;
 - import NAMESPACE ;

 COMMENT
 COMMENT
 <nb> public interface IActor
 COMMENT
 COMMENT
 COMMENT
 - public static < T extends IActor > T getReference ( Class < T > iActor , String id )
 + static < T extends IActor > T getReference ( Class < T > iActor , String id )
 {
 return ReferenceFactory . ref ( iActor , id ) ;
 }

Removing unnecessary modifier and import


<nb> public class Foreign extends Column {
 if ( foreignValues . size ( ) > NUMBER0 ) {

 if ( this . db != null ) {
 - for ( Object item : foreignValues ) {
 - try {
 - this . db . saveOrUpdate ( item ) ;
 - } catch ( DbException e ) {
 - LogUtils . e ( e . getMessage ( ) , e ) ;
 - }
 - }
 + this . db . saveOrUpdate ( foreignValues ) ;
 }

 Class foreignEntityType = ColumnUtils . getForeignEntityType ( this ) ;


<nb> public abstract class AbstractBlackBoxTestCase extends TestCase {
 try {
 result = barcodeReader . decode ( source ) ;
 } catch ( ReaderException re ) {
 - System . out . println ( re ) ;
 + System . out . println ( re + STRING0 + rotationInDegrees + STRING1 ) ;
 return false ;
 }

 <nb> public abstract class AbstractBlackBoxTestCase extends TestCase {
 try {
 result = barcodeReader . decode ( source , TRY_HARDER_HINT ) ;
 } catch ( ReaderException re ) {
 - fail ( STRING2 ) ;
 + fail ( STRING3 + rotationInDegrees + STRING1 ) ;
 return false ;
 }
 if ( ! expectedFormat . equals ( result . getBarcodeFormat ( ) ) ) {

Added rotation to unit test output for clarification


<nb> public class NodeTraversal {
 sourceName = getSourceName ( n ) ;
 curNode = n ;
 pushScope ( s ) ;
 - traverseBranch ( n , n . getParent ( ) ) ;
 + for ( Node child = n . getFirstChild ( ) ; child != null ; ) {
 + Node next = child . getNext ( ) ;
 + traverseBranch ( child , n ) ;
 + child = next ;
 + }

 popScope ( ) ;
 } else {

Fixing traverseAtScope in NodeTraversal to traverse all children in a BLOCK


<nb> import static NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - SINGLE
 - @ ignore
 public class DynamoDbConfigurationSourceTest {

 @ test

Enable the test now that it uses Amazon mock


<nb> public class ProjectScope {
 private final ProjectFileIndex myFileIndex = projectRootManager . getFileIndex ( ) ;

 public boolean contains ( VirtualFile file ) {
 + if ( myFileIndex . isInLibraryClasses ( file ) ) return false ;
 +
 return file instanceof VirtualFileWindow || myFileIndex . isInContent ( file ) ;
 }

 <nb> public class ModuleWithDependentsScope extends GlobalSearchScope {
 if ( moduleOfFile == null ) return false ;
 if ( ! myModules . contains ( moduleOfFile ) ) return false ;
 if ( myOnlyTests && ! myProjectFileIndex . isInTestSourceContent ( file ) ) return false ;
 + if ( myProjectFileIndex . isInLibraryClasses ( file ) ) return false ;
 return true ;
 }

our most used scopes didn t honor their own search in libraries flag


<nb> public class ByteBuddyAgent {
 @ override
 @ suppressfbwarnings ( value = STRING0 , justification = STRING1 )
 public Accessor attempt ( ) {
 - File toolsJar = new File ( System . getProperty ( JAVA_HOME_PROPERTY ) . replace ( STRING2 , STRING3 ) + STRING4 + toolsJarPath ) ;
 + File toolsJar = new File ( System . getProperty ( JAVA_HOME_PROPERTY ) , toolsJarPath ) ;
 + System . out . println ( STRING5 + toolsJar + STRING6 + toolsJar . isFile ( ) ) ;
 try {
 return toolsJar . isFile ( ) && toolsJar . canRead ( )
 ? Accessor . Simple . of ( new URLClassLoader ( new URL [ ] { toolsJar . toURI ( ) . toURL ( ) } , BOOTSTRAP_CLASS_LOADER ) )


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

 import NAMESPACE ;
 <nb> public final class ActivityThread {

 Security . addProvider ( new AndroidKeyStoreProvider ( ) ) ;

 + SINGLE
 + final File configDir = Environment . getUserConfigDirectory ( UserHandle . myUserId ( ) ) ;
 + TrustedCertificateStore . setDefaultUserDirectory ( configDir ) ;
 +
 Process . setArgV0 ( STRING0 ) ;

 Looper . prepareMainLooper ( ) ;

Choose CA certificate storage according to userId


<nb>
 package NAMESPACE ;

 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class Renderer {
 df . setTimeZone ( TimeZone . getTimeZone ( STRING0 ) ) ;
 String ds = df . format ( new Date ( sptRequestA . dateTime * NUMBER0 ) ) ;
 shadowWrite ( image , ds , sptRequestA . from ) ;
 +
 + Graphics2D g2d = image . createGraphics ( ) ;
 + g2d . setComposite ( AlphaComposite . getInstance ( AlphaComposite . SRC ) ) ;
 + BufferedImage legend = Tile . getLegend ( renderRequest . style , NUMBER1 , NUMBER2 ) ;
 + g2d . drawImage ( legend , NUMBER3 , image . getHeight ( ) - NUMBER2 , null ) ;
 + g2d . dispose ( ) ;
 }
 -
 +
 SINGLE
 if ( renderRequest . format . toString ( ) . equals ( STRING1 ) ) {
 GridCoverage2D gc = tile . getGridCoverage2D ( image ) ;

add legend to WMS responses with timestamps


<nb> public abstract class ResponseBody implements Closeable {
 return contentType != null ? contentType . charset ( UTF_8 ) : UTF_8 ;
 }

 - @ override public void close ( ) throws IOException {
 - source ( ) . close ( ) ;
 + @ override public void close ( ) {
 + Util . closeQuietly ( source ( ) ) ;
 }

 COMMENT

Do not burden application code with close failures


<nb> public final class BluetoothAdapter {
 COMMENT
 public static final int STATE_DISCONNECTING = NUMBER0 ;

 - COMMENT
 - COMMENT
 - public static final int STATE_ADVERTISE_STARTING = NUMBER1 ;
 - COMMENT
 - public static final int STATE_ADVERTISE_STARTED = NUMBER2 ;
 - COMMENT
 - public static final int STATE_ADVERTISE_STOPPING = NUMBER3 ;
 - COMMENT
 - public static final int STATE_ADVERTISE_STOPPED = NUMBER0 ;
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - public static final int STATE_ADVERTISE_FORCE_STOPPING = NUMBER4 ;
 -
 COMMENT
 public static final String BLUETOOTH_MANAGER_SERVICE = STRING0 ;

 - COMMENT
 - public static final int ADVERTISE_CALLBACK_SUCCESS = NUMBER1 ;
 -
 private static final int ADDRESS_LENGTH = NUMBER5 ;

 private static final int CONTROLLER_ENERGY_UPDATE_TIMEOUT_MILLIS = NUMBER6 ;

delete BLE advertising related hidden state references in Bluetooth Adapter


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

 COMMENT
 COMMENT
 <nb> public class MailMessage extends DefaultMessage {

 @ override
 public String toString ( ) {
 - if ( mailMessage != null ) {
 - return STRING0 + MailUtils . dumpMessage ( mailMessage ) ;
 - } else {
 - return STRING0 + getBody ( ) ;
 - }
 + SINGLE
 + return STRING1 + ObjectHelper . getIdentityHashCode ( this ) ;
 }

 public MailMessage copy ( ) {

Do not dump mail content in toString of mail message


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class PyUserSkeletonsUtil {
 public static VirtualFile getUserSkeletonsDirectory ( ) {
 if ( ourUserSkeletonsDirectory == null ) {
 for ( String path : getPossibleUserSkeletonsPaths ( ) ) {
 - ourUserSkeletonsDirectory = LocalFileSystem . getInstance ( ) . findFileByPath ( path ) ;
 + ourUserSkeletonsDirectory = StandardFileSystems . local ( ) . findFileByPath ( path ) ;
 if ( ourUserSkeletonsDirectory != null ) {
 break ;
 }

Get the local file system via StandardFileSystems local


<nb> public class WindowInsetsCompat {
 mInsets = insets ;
 }

 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 public WindowInsetsCompat ( WindowInsetsCompat src ) {
 mInsets = src == null ? null : IMPL . getSourceWindowInsets ( src . mInsets ) ;
 }


<nb> abstract class RippleComponent {

 if ( mHasPendingHardwareAnimator ) {
 mHasPendingHardwareAnimator = false ;
 +
 + SINGLE
 + SINGLE
 + jumpValuesToExit ( ) ;
 }
 }

Manually jump ripples when preemptively aborting RT animation


<nb> import NAMESPACE ;

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

 COMMENT
 <nb> public class DefaultConversionServiceTests {
 assertEquals ( STRING0 , conversionService . convert ( new SSN ( STRING0 ) , String . class ) ) ;
 }

 - @ test ( expected = ConversionFailedException . class )
 + @ test ( expected = ConverterNotFoundException . class )
 public void convertObjectToObjectNoValueOFMethodOrConstructor ( ) {
 DefaultConversionService conversionService = new DefaultConversionService ( ) ;
 conversionService . convert ( new Long ( NUMBER0 ) , SSN . class ) ;

updated test to reflect correct behavior


<nb> public class InputStreamBodyGenerator implements BodyGenerator {
 public long read ( ByteBuffer buffer ) throws IOException {

 SINGLE
 - chunk = new byte [ buffer . capacity ( ) - NUMBER0 ] ;
 + chunk = new byte [ buffer . capacity ( ) - NUMBER1 ] ;

 int read = - NUMBER2 ;
 -
 try {
 read = inputStream . read ( chunk ) ;
 } catch ( IOException ex ) {

More safe guess still need a better solution


<nb> public abstract class Property < TYPE > extends Field < TYPE > implements Cloneable {
 }

 @ override
 - public < RETURN , PARAMETER > RETURN accept ( PropertyVisitor < RETURN , PARAMETER > visitor , PARAMETER data ) {
 - return visitor . visitString ( this , data ) ;
 - }
 -
 - @ override
 - public < RETURN , DST , PARAMETER > RETURN accept ( PropertyWritingVisitor < RETURN , DST , PARAMETER > visitor ,
 - DST dst , PARAMETER data ) {
 - return visitor . visitString ( this , dst , data ) ;
 - }
 -
 - @ override
 @ suppresswarnings ( STRING0 )
 public EnumProperty < T > as ( String newAlias ) {
 return ( EnumProperty < T > ) super . as ( newAlias ) ;


<nb> public class RecentProjectsManager implements ApplicationComponent , JDOMExternal
 }

 private static String getProjectPath ( Project project ) {
 - return project . getLocation ( ) ;
 + return project . getLocation ( ) . replace ( STRING0 , File . separatorChar ) ;
 }

 private static class ReopenProjectAction extends AnAction {


<nb> class WidgetHelper {
 } else if ( TextUtils . equals ( section , context . getString ( R . string . pref_widget_section_value_best ) ) ) {
 title = context . getString ( R . string . title_activity_best ) ;
 destination = BestActivity . class ;
 - } else if ( TextUtils . equals ( section , context . getString ( R . string . pref_widget_section_value_best ) ) ) {
 + } else if ( TextUtils . equals ( section , context . getString ( R . string . pref_widget_section_value_top ) ) ) {
 title = context . getString ( R . string . title_activity_list ) ;
 destination = ListActivity . class ;
 } else {


<nb> public class SemanticPipeline {
 void assignLexerTokenTypes ( Grammar g , List < GrammarAST > tokensDefs ) {
 Grammar G = g . getOutermostGrammar ( ) ; SINGLE
 for ( GrammarAST def : tokensDefs ) {
 - if ( def . getType ( ) == ANTLRParser . TOKEN_REF ) G . defineTokenName ( def . getText ( ) ) ;
 + SINGLE
 + if ( Grammar . isTokenName ( def . getText ( ) ) ) {
 + G . defineTokenName ( def . getText ( ) ) ;
 + }
 }

 COMMENT


<nb> public class StreamWithActorsTest extends ActorBaseTest
 final Stage stage2 = createStage ( ) ;
 AsyncStream < String > test = AsyncStream . getStream ( String . class , STRING0 ) ;

 - hello . doUnSubscribe ( STRING0 ) ;
 + hello . doUnSubscribe ( STRING0 ) . join ( ) ;
 test . post ( STRING1 ) . join ( ) ;
 assertFalse ( fakeSync . get ( STRING2 ) . isDone ( ) ) ;
 dumpMessages ( ) ;


<nb> public final class Intersector {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 static public boolean intersectRayBoundsFast ( Ray ray , BoundingBox box ) {
 <nb> public class Quaternion implements Serializable {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 COMMENT
 public Quaternion setFromAxes ( float xx , float xy , float xz ,
 float yx , float yy , float yz ,


<nb> public class J3MLoader implements AssetLoader {
 technique = new TechniqueDef ( null ) ;
 } else if ( split . length == NUMBER0 ) {
 String techName = split [ NUMBER1 ] ;
 - if ( techName . equals ( STRING0 ) ) {
 - throw new UnsupportedOperationException (
 - STRING1 + key + STRING2
 - + STRING3 ) ;
 - }
 technique = new TechniqueDef ( techName ) ;
 } else {
 throw new IOException ( STRING4 ) ;

Remove useless check against material technique name being called FixedFunc


<nb> public class JBTabbedTerminalWidget extends TabbedTerminalWidget implements Disp
 }

 @ override
 + public int indexOfComponent ( Component component ) {
 + for ( int i = NUMBER0 ; i < myTabs . getTabCount ( ) ; i ++ ) {
 + if ( component . equals ( myTabs . getTabAt ( i ) . getComponent ( ) ) ) {
 + return i ;
 + }
 + }
 +
 + return - NUMBER1 ;
 + }
 +
 + @ override
 public int indexOfTabComponent ( Component component ) {
 return NUMBER0 ; SINGLE
 }


<nb> public class StatsUtils {
 Date date = new Date ( ) ;
 SimpleDateFormat gmtDf = new SimpleDateFormat ( STRING0 ) ;

 + if ( blogTimeZoneOption == null ) {
 + AppLog . w ( T . UTILS , STRING1 ) ;
 + return gmtDf . format ( date ) ;
 + }
 +
 if ( blogTimeZoneOption . equals ( STRING2 ) ) {
 gmtDf . setTimeZone ( TimeZone . getTimeZone ( STRING3 ) ) ;
 } else if ( blogTimeZoneOption . startsWith ( STRING4 ) ) {

Add a not null checking of blogTimeZoneOption in getCurrentDateTZ


<nb> package NAMESPACE ;
 @ deprecated
 public interface Clock
 {
 + COMMENT
 + COMMENT
 + COMMENT
 + @ deprecated
 Clock SYSTEM_CLOCK = new Clock ( )
 {
 @ override
 <nb>
 COMMENT
 package NAMESPACE ;

 + import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 + COMMENT
 + COMMENT
 + COMMENT
 + @ deprecated
 public class FrozenClock implements Clock
 {
 private final long nanos ;
 <nb> import NAMESPACE ;
 import static NAMESPACE ;
 import static NAMESPACE ;

 + COMMENT
 + COMMENT
 + COMMENT
 + @ deprecated
 public class FakeClock implements Clock
 {
 private volatile long time ;
 <nb> import NAMESPACE ;

 COMMENT
 COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 + @ deprecated
 public class TickingClock implements Clock
 {
 private long currentNanoTime ;

Added more deprecation flags and info to Clock implementations


<nb> public class PersistenceWindowPool implements WindowPool
 {
 brickSize = Integer . MAX_VALUE ;
 }
 + brickSize = ( brickSize / blockSize ) * blockSize ;
 if ( brickSize == NUMBER0 )
 {
 brickSize = blockSize ;
 }
 - brickSize = ( brickSize / blockSize ) * blockSize ;
 brickCount = ( int ) ( fileSize / brickSize ) ;
 }
 else


<nb> import static NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - public class SpdyFrameEncoder extends MessageToByteEncoder {
 + public class SpdyFrameEncoder extends MessageToByteEncoder < Object > {

 private final int version ;
 private volatile boolean finished ;


<nb> public class NeoTransactionIndexApplier extends NeoCommandHandler . Adapter
 this . propertyLoader = propertyLoader ;
 }

 - public void done ( )
 + @ override
 + public void close ( )
 {
 if ( ! labelUpdates . isEmpty ( ) )
 {
 <nb> public class NeoTransactionStoreApplier extends NeoCommandHandler . Adapter
 return true ;
 }

 - public void done ( )
 + @ override
 + public void close ( )
 {
 if ( recovery )
 {


<nb> public class RemoteFileProducer < T > extends GenericFileProducer < T > implements Ser

 public void process ( Exchange exchange ) throws Exception {
 Exchange remoteExchange = getEndpoint ( ) . createExchange ( exchange ) ;
 - processExchange ( remoteExchange ) ;
 + String target = createFileName ( exchange ) ;
 + processExchange ( remoteExchange , target ) ;
 ExchangeHelper . copyResults ( exchange , remoteExchange ) ;
 }

Fixed compiler error due API change in processExchange method


<nb> public abstract class BaseActivity extends SherlockFragmentActivity implements
 if ( isAutoUpdateEnabled ) {
 SINGLE
 long now = System . currentTimeMillis ( ) ;
 - final long previousUpdateTime = prefs . getLong (
 + long previousUpdateTime = prefs . getLong (
 SeriesGuidePreferences . KEY_LASTUPDATE , NUMBER0 ) ;
 + SINGLE
 + SINGLE
 + if ( previousUpdateTime == NUMBER0 ) {
 + previousUpdateTime = now ;
 + prefs . edit ( ) . putLong ( SeriesGuidePreferences . KEY_LASTUPDATE , now )
 + . commit ( ) ;
 + }
 +
 final boolean isTime = ( now - previousUpdateTime ) > NUMBER1 * DateUtils . MINUTE_IN_MILLIS ;

 if ( isTime ) {

Move last auto update default setter back into BaseActivity similar to auto backup


<nb> public class ZenCodingTemplate extends CustomLiveTemplateBase {
 @ override
 public void expand ( @ notnull String key , @ notnull CustomTemplateCallback callback ) {
 ZenCodingGenerator defaultGenerator = findApplicableDefaultGenerator ( callback . getContext ( ) , false ) ;
 - assert defaultGenerator != null ;
 + if ( defaultGenerator == null ) {
 + LOG . error ( STRING0 + key + STRING1 + callback . getEditor ( ) . getCaretModel ( ) . getOffset ( ) + STRING2 ,
 + AttachmentFactory . createAttachment ( callback . getEditor ( ) . getDocument ( ) ) ) ;
 + return ;
 + }
 try {
 expand ( key , callback , defaultGenerator , Collections . < ZenCodingFilter > emptyList ( ) , true , Registry . intValue ( STRING3 ) ) ;
 }


<nb> public class PhoneStatusBar extends BaseStatusBar {
 mGestureRec . add ( event ) ;
 }

 - setInteracting ( true ) ;
 + if ( mStatusBarWindowState == WINDOW_STATE_SHOWING ) {
 + setInteracting ( true ) ;
 + }
 return false ;
 }

 <nb> public class PhoneStatusBar extends BaseStatusBar {
 && mStatusBarWindowState != state ) {
 mStatusBarWindowState = state ;
 if ( DEBUG_WINDOW_STATE ) Log . d ( TAG , STRING0 + windowStateToString ( state ) ) ;
 - mStatusBarWindow . setEnabled ( showing ) ;
 if ( ! showing ) {
 mStatusBarView . collapseAllPanels ( false ) ;
 }
 <nb> public class PhoneStatusBar extends BaseStatusBar {
 && mNavigationBarWindowState != state ) {
 mNavigationBarWindowState = state ;
 if ( DEBUG_WINDOW_STATE ) Log . d ( TAG , STRING1 + windowStateToString ( state ) ) ;
 - mNavigationBarView . setEnabled ( showing ) ;
 }
 }


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public abstract class AbstractCamelContextFactoryBean < T extends ModelCamelContex
 LOG . info ( STRING0 , streamCachingStrategy ) ;
 getContext ( ) . setStreamCachingStrategy ( streamCachingStrategy ) ;
 }
 + MessageHistoryFactory messageHistoryFactory = getBeanForType ( MessageHistoryFactory . class ) ;
 + if ( messageHistoryFactory != null ) {
 + LOG . info ( STRING1 , messageHistoryFactory ) ;
 + getContext ( ) . setMessageHistoryFactory ( messageHistoryFactory ) ;
 + }
 }
 }


<nb> public interface IMountService extends IInterface {
 static final int ENCRYPTION_STATE_NONE = NUMBER0 ;
 COMMENT
 static final int ENCRYPTION_STATE_OK = NUMBER1 ;
 - COMMENT
 + COMMENT
 static final int ENCRYPTION_STATE_ERROR_UNKNOWN = - NUMBER0 ;
 - COMMENT
 + COMMENT
 static final int ENCRYPTION_STATE_ERROR_INCOMPLETE = - NUMBER2 ;
 + COMMENT
 + static final int ENCRYPTION_STATE_ERROR_INCONSISTENT = - NUMBER3 ;
 + COMMENT
 + static final int ENCRYPTION_STATE_ERROR_CORRUPT = - NUMBER4 ;

 COMMENT
 COMMENT

Add constants so we can distinguish decryption failures


<nb> public final class ClientHandler extends SimpleChannelInboundHandler < RPCMessage >
 COMMENT
 COMMENT
 public ClientHandler ( ) {
 - mListeners = new HashSet < ResponseListener > ( NUMBER0 ) ;
 + mListeners = new HashSet < > ( NUMBER0 ) ;
 }

 COMMENT

SMALLFIX Removed explicit type argument in ClientHandler


<nb> public final class Native {
 return null ;
 try {
 ClassLoader cl = Native . class . getClassLoader ( ) ;
 - Method m = ClassLoader . class . getMethod ( STRING0 , new Class [ ] { String . class } ) ;
 + Method m = ClassLoader . class . getDeclaredMethod ( STRING0 , new Class [ ] { String . class } ) ;
 m . setAccessible ( true ) ;
 String libpath = ( String ) m . invoke ( cl , new Object [ ] { libName } ) ;
 if ( libpath != null ) {


<nb> public class GradientDrawable extends Drawable {
 }

 @ override
 + public ColorFilter getColorFilter ( ) {
 + return mColorFilter ;
 + }
 +
 + @ override
 public void setColorFilter ( ColorFilter cf ) {
 if ( cf != mColorFilter ) {
 mColorFilter = cf ;


<nb> public final class Driver {
 if ( cmdLine . hasOption ( inputOpt ) ) { SINGLE
 File file = new File ( cmdLine . getValue ( inputOpt ) . toString ( ) ) ;
 if ( ! file . isDirectory ( ) ) {
 - throw new IllegalArgumentException ( STRING0 + file . getName ( ) +
 + throw new IllegalArgumentException ( STRING0 + file . getAbsolutePath ( ) +
 STRING1 ) ;
 }

Fixed error message to print full import path


<nb> public class LuceneInvertedIndex implements InvertedIndex , IndexReader . ReaderClos
 private VocabCache vocabCache ;
 public final static String WORD_FIELD = STRING0 ;
 private int numDocs = NUMBER0 ;
 - private List < List < VocabWord > > words = new CopyOnWriteArrayList < > ( ) ;
 + private List < List < VocabWord > > words = Collections . synchronizedList ( new ArrayList < List < VocabWord > > ( ) ) ;
 private boolean cache = true ;
 private transient ExecutorService indexManager ;
 private AtomicBoolean indexBeingCreated = new AtomicBoolean ( false ) ;


<nb> class Clicker {
 }
 eventTime = SystemClock . uptimeMillis ( ) ;
 event = MotionEvent . obtain ( downTime , eventTime , MotionEvent . ACTION_MOVE ,
 - x + ViewConfiguration . getTouchSlop ( ) / NUMBER0 ,
 - y + ViewConfiguration . getTouchSlop ( ) / NUMBER0 , NUMBER1 ) ;
 + x + ViewConfiguration . get ( inst . getTargetContext ( ) ) . getScaledTouchSlop ( ) / NUMBER0 ,
 + y + ViewConfiguration . get ( inst . getTargetContext ( ) ) . getScaledTouchSlop ( ) / NUMBER0 , NUMBER1 ) ;
 inst . sendPointerSync ( event ) ;
 if ( time > NUMBER1 )
 sleeper . sleep ( time ) ;

Replaced deprecated method in Clicker java


<nb> public class MappedField {
 }
 if ( isMap ( ) ) {
 sb . append ( STRING0 ) ;
 - sb . append ( STRING1 ) . append ( getMapKeyClass ( ) . getSimpleName ( ) ) ;
 + if ( getMapKeyClass ( ) != null )
 + sb . append ( STRING1 ) . append ( getMapKeyClass ( ) . getSimpleName ( ) ) ;
 + else
 + sb . append ( STRING2 ) ;
 }

 if ( isSet ( ) )
 <nb> public class QueryImpl < T > extends CriteriaContainerImpl implements Query < T > , Cri
 results . add ( ent ) ;

 if ( log . isTraceEnabled ( ) )
 - log . trace ( String . format ( STRING3 ,
 + log . trace ( String . format ( STRING4 ,
 dbColl . getName ( ) ,
 results . size ( ) ,
 iter . getDriverTime ( ) ,


<nb> public class TheTVDB {
 if ( episodeIDs . containsKey ( episodeId ) ) {
 SINGLE
 if ( episodeIDs . get ( episodeId ) < values . getAsLong ( Episodes . LASTEDIT ) ) {
 - SINGLE
 + SINGLE
 batch . add ( DBUtils . buildEpisodeOp ( values , false ) ) ;
 + } else {
 + SINGLE
 + ContentValues smallValues = new ContentValues ( ) ;
 + smallValues . put ( Episodes . _ID , values . getAsString ( Episodes . _ID ) ) ;
 + smallValues . put ( Episodes . RATING , values . getAsString ( Episodes . RATING ) ) ;
 + batch . add ( DBUtils . buildEpisodeOp ( smallValues , false ) ) ;
 }
 } else {
 SINGLE


<nb> import NAMESPACE ;
 public abstract class Message < T extends Message < T > > implements Serializable {
 private static final long serialVersionUID = NUMBER0 L ;

 - final transient TagMap tagMap ;
 + final TagMap tagMap ;

 COMMENT
 - transient int cachedSerializedSize = NUMBER0 ;
 + int cachedSerializedSize = NUMBER0 ;

 COMMENT
 - protected transient int hashCode = NUMBER0 ;
 + protected int hashCode = NUMBER0 ;

 protected Message ( TagMap tagMap ) {
 if ( tagMap == null ) {


<nb> public class GrailsDispatcherServlet extends DispatcherServlet {

 finally {
 if ( ! participate ) {
 + if ( ! FlushMode . NEVER . equals ( session . getFlushMode ( ) ) ) {
 + session . flush ( ) ;
 + }
 SINGLE
 TransactionSynchronizationManager . unbindResource ( sessionFactory ) ;
 logger . debug ( STRING0 ) ;

added code to flush session following call to bootstrap classes so that changes to persistent instances are executed


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

 public class SearchCoreFactory {
 - SINGLE
 - SINGLE
 - SINGLE
 - SINGLE

 - SINGLE
 SINGLE
 SINGLE

 <nb> public class SearchCoreFactory {

 SINGLE

 + SINGLE
 +
 + SINGLE
 SINGLE
 - SINGLE
 SINGLE

 SINGLE


<nb> public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU
 log . debug ( sm . getString ( STRING0 , connectionId ) , ioe ) ;
 }
 close ( ) ;
 - result = SocketState . CLOSED ;
 break ;
 }

 <nb> public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU
 log . debug ( sm . getString ( STRING0 , connectionId ) , ioe ) ;
 }
 close ( ) ;
 - result = SocketState . CLOSED ;
 break ;
 }

 <nb> public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU
 SINGLE
 SINGLE
 close ( ) ;
 - result = SocketState . CLOSED ;
 break ;
 }


<nb> public class Scroller {
 SINGLE
 mCurrY = Math . min ( mCurrY , mMaxY ) ;
 mCurrY = Math . max ( mCurrY , mMinY ) ;
 -
 +
 + if ( mCurrX == mFinalX && mCurrY == mFinalY ) {
 + mFinished = true ;
 + }
 +
 break ;
 }
 }

Fix a bug that could cause flings to last too long using a Scroller


<nb>
 COMMENT
 package NAMESPACE ;

 - import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 + import static NAMESPACE ;
 import static NAMESPACE ;

 public class TableAlreadyExistsException
 - extends NotFoundException
 + extends PrestoException
 {
 private final SchemaTableName tableName ;

 <nb> public class TableAlreadyExistsException

 public TableAlreadyExistsException ( SchemaTableName tableName , String message )
 {
 - super ( message ) ;
 + super ( ALREADY_EXISTS , message ) ;
 this . tableName = tableName ;
 }

 <nb>
 COMMENT
 package NAMESPACE ;

 - import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 + import static NAMESPACE ;
 import static NAMESPACE ;

 public class ViewAlreadyExistsException
 - extends NotFoundException
 + extends PrestoException
 {
 private final SchemaTableName viewName ;

 <nb> public class ViewAlreadyExistsException

 public ViewAlreadyExistsException ( SchemaTableName viewName , String message )
 {
 - super ( message ) ;
 + super ( ALREADY_EXISTS , message ) ;
 this . viewName = viewName ;
 }


<nb> public class State_ContentView extends ControllerState {
 mCanvas . fadeInTargets ( ) ;
 }

 - mTouchBubble . doSnap ( mCanvas , mTargetX , mTargetY ) ;
 + if ( mDidMove ) {
 + mTouchBubble . doSnap ( mCanvas , mTargetX , mTargetY ) ;
 + }
 return true ;
 }

Fix bug with snapping being active when switching content view bubbles


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

 - import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 COMMENT
 <nb> public class BooleanFormPropertyRenderer extends AbstractFormPropertyRenderer {
 @ override
 public Field getPropertyField ( FormProperty formProperty ) {

 - Button button = new Button ( getPropertyLabel ( formProperty ) ) ;
 - button . setRequired ( formProperty . isRequired ( ) ) ;
 - button . setEnabled ( formProperty . isWritable ( ) ) ;
 + CheckBox checkBox = new CheckBox ( getPropertyLabel ( formProperty ) ) ;
 + checkBox . setRequired ( formProperty . isRequired ( ) ) ;
 + checkBox . setEnabled ( formProperty . isWritable ( ) ) ;

 if ( formProperty . getValue ( ) != null ) {
 - button . setValue ( formProperty . getValue ( ) ) ;
 + checkBox . setValue ( formProperty . getValue ( ) ) ;
 }

 - return button ;
 + return checkBox ;
 }

 }

Using comboxBox for boolean type rendering instead fo button


<nb> public class DynamicRecordTemplate extends RecordTemplate
 }
 else if ( DataTemplate . class . isAssignableFrom ( fieldDef . getType ( ) ) )
 {
 - putWrapped ( field , ( Class < DataTemplate < ? > > ) fieldDef . getType ( ) , ( DataTemplate ) value ) ;
 + putWrapped ( field , ( Class < DataTemplate < ? > > ) fieldDef . getType ( ) , ( DataTemplate < ? > ) value ) ;
 }
 else
 {

Tiny cast change that fixes compile errors on my machine


<nb> public abstract class HttpContentDecoder extends MessageToMessageDecoder < Object ,
 if ( hasContent && ( decoder = newContentDecoder ( contentEncoding ) ) != null ) {
 SINGLE
 SINGLE
 - m . setHeader (
 - HttpHeaders . Names . CONTENT_ENCODING ,
 - getTargetContentEncoding ( contentEncoding ) ) ;
 + String targetContentEncoding = getTargetContentEncoding ( contentEncoding ) ;
 + if ( HttpHeaders . Values . IDENTITY . equals ( targetContentEncoding ) ) {
 + SINGLE
 + SINGLE
 + m . removeHeader ( HttpHeaders . Names . CONTENT_ENCODING ) ;
 + } else {
 + m . setHeader ( HttpHeaders . Names . CONTENT_ENCODING , targetContentEncoding ) ;
 + }

 if ( m . getTransferEncoding ( ) . isSingle ( ) ) {
 ByteBuf content = m . getContent ( ) ;

Do not set Content Encoding if the target encoding is identity


<nb> public class GraphiteReporter implements Runnable {
 long epoch = System . currentTimeMillis ( ) / NUMBER0 ;
 printVmMetrics ( epoch ) ;
 printRegularMetrics ( epoch ) ;
 + writer . flush ( ) ;
 } catch ( Exception e ) {
 e . printStackTrace ( ) ;
 + writer . flush ( ) ;
 }
 }

 <nb> public class GraphiteReporter implements Runnable {
 try {
 writer . write ( prefix ) ;
 writer . write ( data ) ;
 - writer . flush ( ) ;
 } catch ( IOException e ) {
 e . printStackTrace ( ) ;
 }

Flush the output stream once tick rather than after each metric


<nb> public class SparkTask extends Task < SparkWork > {
 perfLogger . PerfLogEnd ( CLASS_NAME , PerfLogger . SPARK_SUBMIT_JOB ) ;

 addToHistory ( jobRef ) ;
 + this . jobID = jobRef . getSparkJobStatus ( ) . getAppID ( ) ;
 rc = jobRef . monitorJob ( ) ;
 SparkJobStatus sparkJobStatus = jobRef . getSparkJobStatus ( ) ;
 if ( rc == NUMBER0 ) {
 <nb> public class SparkTask extends Task < SparkWork > {
 SINGLE
 jobRef . cancelJob ( ) ;
 }
 + if ( this . jobID == null ) {
 + this . jobID = sparkJobStatus . getAppID ( ) ;
 + }
 sparkJobStatus . cleanup ( ) ;
 } catch ( Exception e ) {
 String msg = STRING0 + Utilities . getNameMessage ( e ) + STRING1 ;

set SparkTask s jobID with application id Zhihai Xu reviewed by Chao Sun


<nb> public final class WebViewClassic implements WebViewProvider , WebViewProvider . Sc
 viewToContentX ( getScrollX ( ) + getWidth ( )
 - mWebView . getVerticalScrollbarWidth ( ) ) ,
 viewToContentY ( getScrollY ( ) + getViewHeightWithTitle ( ) ) ) ;
 - content = nativeSubtractLayers ( content ) ;
 int screenTop = contentToViewY ( content . top ) ;
 int screenBottom = contentToViewY ( content . bottom ) ;
 int height = screenBottom - screenTop ;
 <nb> public final class WebViewClassic implements WebViewProvider , WebViewProvider . Sc
 private native void nativeCopyBaseContentToPicture ( Picture pict ) ;
 private native boolean nativeHasContent ( ) ;
 private native void nativeStopGL ( ) ;
 - private native Rect nativeSubtractLayers ( Rect content ) ;
 private native void nativeDiscardAllTextures ( ) ;
 private native void nativeTileProfilingStart ( ) ;
 private native float nativeTileProfilingStop ( ) ;


<nb> public class WindowManagerService extends IWindowManager . Stub
 canvas . drawBitmap ( rawss , matrix , null ) ;
 canvas . setBitmap ( null ) ;

 - if ( true || DEBUG_SCREENSHOT ) {
 + if ( DEBUG_SCREENSHOT ) {
 SINGLE
 int [ ] buffer = new int [ bm . getWidth ( ) * bm . getHeight ( ) ] ;
 bm . getPixels ( buffer , NUMBER0 , bm . getWidth ( ) , NUMBER0 , NUMBER0 , bm . getWidth ( ) , bm . getHeight ( ) ) ;


<nb> public class Rebalancer implements Runnable {
 executors . shutdownNow ( ) ;
 }

 - @ suppresswarnings ( STRING0 )
 private void rebalanceStore ( String storeName ,
 AdminClient adminClient ,
 RebalancePartitionsInfo stealInfo )
 <nb> public class Rebalancer implements Runnable {
 voldemortConfig . getAdminSocketTimeout ( ) ,
 TimeUnit . SECONDS ) ;

 - rebalanceStatusList . remove ( ( Object ) new Integer ( asyncId ) ) ;
 + rebalanceStatusList . remove ( ( Object ) asyncId ) ;

 if ( stealInfo . getDeletePartitionsList ( ) . size ( ) > NUMBER0 ) {
 adminClient . deletePartitions ( stealInfo . getDonorId ( ) ,

Remove unnecessary allocation cast and SuppressWarnings annotation


<nb> public class ActionBarOverlayLayout extends ViewGroup {
 topInset += mActionBarHeight ;
 }
 }
 - } else if ( mActionBarTop . getVisibility ( ) == VISIBLE ) {
 + } else if ( mActionBarTop . getVisibility ( ) != GONE ) {
 SINGLE
 SINGLE
 topInset = mActionBarTop . getMeasuredHeight ( ) ;


<nb> public interface SQLCommonQuery < Q extends SQLCommonQuery < Q > > extends Query < Q > {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public interface SQLCommonQuery < Q extends SQLCommonQuery < Q > > extends Query < Q > {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public interface SQLCommonQuery < Q extends SQLCommonQuery < Q > > extends Query < Q > {
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT


<nb> abstract class CombiningEvaluator extends Evaluator {

 @ override
 public boolean matches ( Element root , Element node ) {
 - for ( Evaluator s : evaluators ) {
 + for ( int i = NUMBER0 ; i < evaluators . size ( ) ; i ++ ) {
 + Evaluator s = evaluators . get ( i ) ;
 if ( ! s . matches ( root , node ) )
 return false ;
 }
 <nb> abstract class CombiningEvaluator extends Evaluator {

 @ override
 public boolean matches ( Element root , Element node ) {
 - for ( Evaluator s : evaluators ) {
 + for ( int i = NUMBER0 ; i < evaluators . size ( ) ; i ++ ) {
 + Evaluator s = evaluators . get ( i ) ;
 if ( s . matches ( root , node ) )
 return true ;
 }

Don t create Iterator objects in these tight Evaluator loops


<nb> public class DocumentationManager implements ProjectComponent {
 private final Project myProject ;
 private Editor myEditor = null ;
 private ParameterInfoController myParameterInfoController ;
 - private final Alarm myUpdateDocAlarm = new Alarm ( Alarm . ThreadToUse . SHARED_THREAD ) ;
 + private final Alarm myUpdateDocAlarm = new Alarm ( Alarm . ThreadToUse . OWN_THREAD ) ;
 private WeakReference < JBPopup > myDocInfoHintRef ;
 private Component myPreviouslyFocused = null ;
 public static final Key < SmartPsiElementPointer > ORIGINAL_ELEMENT_KEY = Key . create ( STRING0 ) ;


<nb> public class BroadcasterTest {
 }

 @ test
 + public void testEmptyBroadcastMethod ( ) throws ExecutionException , InterruptedException , ServletException {
 + broadcaster . resumeAll ( ) ;
 +
 + broadcaster . broadcast ( STRING0 ) . get ( ) ;
 + assertEquals ( atmosphereHandler . value . get ( ) , new HashSet ( ) ) ;
 + }
 +
 + @ test
 public void testSetBroadcastMethod ( ) throws ExecutionException , InterruptedException , ServletException {
 AtmosphereConfig config = new AtmosphereFramework ( )
 . setAsyncSupport ( mock ( BlockingIOCometSupport . class ) )
 <nb> public class BroadcasterTest {

 broadcaster . broadcast ( STRING0 , set ) . get ( ) ;

 - assertEquals ( atmosphereHandler . value . get ( ) , set ) ;
 + assertEquals ( atmosphereHandler . value . get ( ) , new HashSet ( ) ) ;
 }

 public final static class AR implements AtmosphereHandler {


<nb> import NAMESPACE ;
 COMMENT
 COMMENT
 public class JavaPlugin implements Plugin {
 - public static final String UPLOAD = STRING0 ;
 - public static final String UPLOAD_DISTS = STRING1 ;
 -
 public static final String CLEAN_TASK_NAME = STRING2 ;
 public static final String INIT_TASK_NAME = STRING3 ;
 public static final String PROCESS_RESOURCES_TASK_NAME = STRING4 ;
 <nb> public class JavaPlugin implements Plugin {
 configureLibs ( project , javaConvention ) ;
 configureDists ( project , javaConvention ) ;

 - project . createTask ( UPLOAD ) ;
 -
 configureEclipse ( project ) ;
 configureEclipseWtpModule ( project ) ;
 }


<nb> public class MaterialDialog extends DialogBase implements View . OnClickListener ,
 COMMENT
 COMMENT
 COMMENT
 - public Builder setAdapter ( ListAdapter adapter ) {
 + public Builder adapter ( ListAdapter adapter ) {
 this . adapter = adapter ;
 return this ;
 }

Rename setAdapter to just adapter to match convention


<nb> public class TextEditingTargetWidget
 toolbar . addRightWidget ( commands_ . executeAllCode ( ) . createToolbarButton ( ) ) ;
 toolbar . addRightWidget ( commands_ . executeToCurrentLine ( ) . createToolbarButton ( ) ) ;
 toolbar . addRightWidget ( commands_ . executeFromCurrentLine ( ) . createToolbarButton ( ) ) ;
 - toolbar . addRightWidget ( commands_ . executeCurrentFunction ( ) . createToolbarButton ( ) ) ;
 toolbar . addRightSeparator ( ) ;
 toolbar . addRightWidget ( commands_ . executeLastCode ( ) . createToolbarButton ( ) ) ;
 toolbar . addRightSeparator ( ) ;

remove execute current function from toolbar


<nb> public class LoaderTask extends AsyncTask < String , Void , Bitmap > {

 private Bitmap getNetworkImage ( File imageFile , Uri uri ) {
 try {
 - loaderSettings . getNetworkManager ( ) . retrieveImage ( uri . getPath ( ) , imageFile ) ;
 + loaderSettings . getNetworkManager ( ) . retrieveImage ( uri . toString ( ) , imageFile ) ;
 } catch ( ImageNotFoundException inf ) {
 return getNotFoundImage ( imageWrapper . getContext ( ) ) ;
 }


<nb> package NAMESPACE ;
 COMMENT
 public class InvalidTicketException extends TicketException {

 + private static final long serialVersionUID = NUMBER0 ;
 +
 private String ticketId = null ;

 - COMMENT
 - private static final long serialVersionUID = NUMBER1 ;
 -
 COMMENT
 private static final String CODE = STRING0 ;

Added a new serialized version id for the invalid ticket exception class


<nb> public class WPMainActivity extends AppCompatActivity {
 case WPMainTabAdapter . TAB_NOTIFS :
 setTabLayoutElevation ( mAppBarElevation ) ;
 Fragment fragment = mTabAdapter . getFragment ( position ) ;
 - if ( fragment instanceof NotificationsListFragment ) {
 - ( ( NotificationsListFragment ) fragment ) . clearPendingNotificationsItemsOnUI ( ) ;
 + if ( fragment instanceof OnScrollToTopListener ) {
 + ( ( OnScrollToTopListener ) fragment ) . onScrollToTop ( ) ;
 }
 break ;
 }

Fix an issue where swiping to the notifications tab dosn t scroll to top


<nb> public class PhotoDiskCache {

 if ( snapshot1 != null ) {
 result1 = snapshot1 . getInputStream ( VALUE_COUNT - NUMBER0 ) ;
 - } else {
 - Log . d ( STRING0 + key ) ;
 - }
 - DiskLruCache . Snapshot snapshot2 = cache . get ( safeKey ) ;
 + DiskLruCache . Snapshot snapshot2 = cache . get ( safeKey ) ;

 - if ( snapshot2 != null ) {
 - result2 = snapshot2 . getInputStream ( VALUE_COUNT - NUMBER0 ) ;
 + if ( snapshot2 != null ) {
 + result2 = snapshot2 . getInputStream ( VALUE_COUNT - NUMBER0 ) ;
 + } else {
 + Log . d ( STRING1 + key ) ;
 + }
 } else {
 - Log . d ( STRING0 + key ) ;
 + Log . d ( STRING2 + key ) ;
 }

 -
 } catch ( IOException e ) {
 Log . d ( STRING3 + key ) ;
 e . printStackTrace ( ) ; SINGLE

Only fetch missing entries in disk cache once


<nb> public class SecondaryReadTest extends TestCase {
 }

 private Mongo loadMongo ( ) throws Exception {
 - return new Mongo ( new MongoURI ( STRING0 ) ) ;
 + return new Mongo ( new MongoURI ( STRING1 ) ) ;
 }

 private CommandResult serverStatusCmd ( final Mongo pMongo ) {
 <nb> public class SecondaryReadTest extends TestCase {

 private static void loadQueryCount ( final List < TestHost > pHosts , final boolean pBefore ) throws Exception {
 for ( final TestHost testHost : pHosts ) {
 - final Mongo mongoHost = new Mongo ( new MongoURI ( STRING2 + testHost . hostnameAndPort ) ) ;
 + final Mongo mongoHost = new Mongo ( new MongoURI ( STRING2 + testHost . hostnameAndPort + STRING3 ) ) ;
 try {
 final CommandResult serverStatusResult
 = mongoHost . getDB ( STRING4 ) . command ( new BasicDBObject ( STRING5 , NUMBER0 ) ) ;


<nb> public class TextArea extends JEditTextArea {
 }
 super . processKeyEvent ( evt ) ;

 - if ( evt . getID ( ) == KeyEvent . KEY_TYPED && editor . errorCheckerService . getASTGenerator ( ) . predictionsEnabled . get ( ) ) {
 + if ( evt . getID ( ) == KeyEvent . KEY_TYPED ) {
 final KeyEvent evt2 = evt ;
 SwingWorker worker = new SwingWorker ( ) {
 protected Object doInBackground ( ) throws Exception {
 errorCheckerService . runManualErrorCheck ( ) ;
 - log ( STRING0 + fetchPhrase ( evt2 ) + STRING1
 - + ( evt2 . getKeyChar ( ) == KeyEvent . VK_ENTER ) ) ;
 + SINGLE
 + if ( editor . errorCheckerService . getASTGenerator ( ) . predictionsEnabled . get ( ) )
 + log ( STRING0 + fetchPhrase ( evt2 ) + STRING1
 + + ( evt2 . getKeyChar ( ) == KeyEvent . VK_ENTER ) ) ;
 return null ;
 }
 } ;


<nb> public class SearchDataQuery implements IObjectSearchQuery {
 continue ;
 }
 case STRING :
 + if ( attribute . getMaxLength ( ) > NUMBER0 && attribute . getMaxLength ( ) < params . searchString . length ( ) ) {
 + continue ;
 + }
 operator = DBCLogicalOperator . LIKE ;
 value = STRING0 + params . searchString + STRING0 ;
 break ;


<nb> public class ReaderSubsActivity extends ActionBarActivity

 ReaderUpdateService . startService ( this ,
 EnumSet . of ( UpdateTask . TAGS ,
 - UpdateTask . FOLLOWED_BLOGS ) ) ;
 + UpdateTask . FOLLOWED_BLOGS ,
 + UpdateTask . RECOMMENDED_BLOGS ) ) ;

 mHasPerformedUpdate = true ;
 }


<nb> public class YoutubeChannelExtractor extends ChannelExtractor {
 private String getNextPageUrl ( Document d ) throws ParsingException {
 try {
 Element button = d . select ( STRING0 ) . first ( ) ;
 - return button . attr ( STRING1 ) ;
 + if ( button != null ) {
 + return button . attr ( STRING1 ) ;
 + } else {
 + SINGLE
 + return STRING2 ;
 + }
 } catch ( Exception e ) {
 throw new ParsingException ( STRING3 , e ) ;
 }


<nb> public final class WXDomModule extends WXModule {
 SINGLE
 e . printStackTrace ( ) ;
 WXLogUtils . e ( STRING0 ) ;
 + } catch ( ClassCastException cce ) {
 + WXLogUtils . e ( STRING1 ) ;
 }
 }


<nb> public class MimeUtility {
 COMMENT
 private static final String [ ] [ ] MIME_TYPE_REPLACEMENT_MAP = new String [ ] [ ] {
 { STRING0 , STRING1 } ,
 - { STRING2 , STRING1 } SINGLE
 + { STRING2 , STRING1 } , SINGLE
 + { STRING3 , STRING4 } SINGLE
 } ;

 public static String unfold ( String s ) {

Rewrite application x zip compressed to application zip


<nb> package NAMESPACE ;
 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> package NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;


<nb> public class JobClient {
 new JobClientMessages . SubmitJobAndWait ( jobGraph ) ,
 new Timeout ( AkkaUtils . INF_TIMEOUT ( ) ) ) ;

 - Object answer = Await . result ( future , timeout ) ;
 + Object answer = Await . result ( future , AkkaUtils . INF_TIMEOUT ( ) ) ;

 if ( answer instanceof JobManagerMessages . JobResultSuccess ) {
 LOG . info ( STRING0 ) ;
 <nb> public class JobClient {
 throw e ;
 }
 catch ( TimeoutException e ) {
 - throw new JobTimeoutException ( jobGraph . getJobID ( ) , STRING1 , e ) ;
 + throw new JobTimeoutException ( jobGraph . getJobID ( ) , STRING2 +
 + STRING3 + AkkaUtils . INF_TIMEOUT ( ) , e ) ;
 }
 catch ( Throwable t ) {
 throw new JobExecutionException ( jobGraph . getJobID ( ) ,


<nb> public class NativeRunnable implements Runnable {

 private final HybridData mHybridData ;

 + @ donotstrip
 private NativeRunnable ( HybridData hybridData ) {
 mHybridData = hybridData ;
 }


<nb> import NAMESPACE ;
 COMMENT
 public class FileBody implements AsyncHttpRequestBody < File > {
 File file ;
 + String contentType = STRING0 ;
 +
 public FileBody ( File file ) {
 this . file = file ;
 }

 + public FileBody ( File file , String contentType ) {
 + this . file = file ;
 + this . contentType = contentType ;
 + }
 +
 @ override
 public void write ( AsyncHttpRequest request , DataSink sink , CompletedCallback completed ) {
 Util . pump ( file , sink , completed ) ;
 <nb> public class FileBody implements AsyncHttpRequestBody < File > {
 throw new AssertionError ( STRING1 ) ;
 }

 - public static final String CONTENT_TYPE = STRING0 ;
 @ override
 public String getContentType ( ) {
 - return CONTENT_TYPE ;
 + return contentType ;
 + }
 +
 + public void setContentType ( String contentType ) {
 + this . contentType = contentType ;
 }

 @ override


<nb> public class EntitySerializer implements Serializer {
 queryType = typeMappings . getPathType ( property . getParameter ( NUMBER0 ) , model , true ) ;

 serialize ( model , property , new ClassType ( PMap . class , getRaw ( property . getParameter ( NUMBER1 ) ) , getRaw ( property . getParameter ( NUMBER0 ) ) , genericQueryType ) ,
 - writer , STRING0 + genericKey + COMMA + genericValue + COMMA + writer . getRawName ( genericQueryType ) + STRING1 ,
 - keyType + DOT_CLASS ,
 - valueType + DOT_CLASS ,
 - queryType + DOT_CLASS ) ;
 + writer , STRING0 + genericKey + COMMA + genericValue + COMMA + writer . getGenericName ( true , genericQueryType ) + STRING1 ,
 + keyType + DOT_CLASS , valueType + DOT_CLASS , writer . getRawName ( queryType ) + DOT_CLASS ) ;
 break ;
 case LIST :
 genericQueryType = typeMappings . getPathType ( getRaw ( property . getParameter ( NUMBER1 ) ) , model , false ) ;


<nb> public class SimpleReplaceRuleTest extends TestCase {
 List < String > invalidSuggestions = new ArrayList < String > ( ) ;
 List < Map < String , String > > wrongWords = rule . getWrongWords ( ) ;
 for ( Map < String , String > ruleEntry : wrongWords ) {
 - for ( String fromWord : ruleEntry . keySet ( ) ) {
 - String toWord = ruleEntry . get ( fromWord ) ;
 + for ( Map . Entry < String , String > fromWord : ruleEntry . entrySet ( ) ) {
 + String toWord = fromWord . getValue ( ) ;
 if ( toWord == null || fromWord . equals ( toWord ) ) {
 invalidSuggestions . add ( toWord ) ;
 }


<nb> import NAMESPACE ;
 import NAMESPACE ;

 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT


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

 import NAMESPACE ;
 <nb> public class DerbyBlockStoreTest {
 COMMENT
 private static final String DB_NAME = STRING0 ;

 + @ before
 + public void shutUp ( ) {
 + SINGLE
 + System . getProperties ( ) . setProperty ( STRING1 , STRING2 ) ;
 + }
 +
 @ after
 public void clear ( ) {
 try {
 <nb> public class DerbyBlockStoreTest {
 assertEquals ( b1 , b2 ) ;
 SINGLE
 assertEquals ( b1 , store . getChainHead ( ) ) ;
 -
 +
 StoredBlock g1 = store . get ( params . genesisBlock . getHash ( ) ) ;
 assertEquals ( params . genesisBlock , g1 . getHeader ( ) ) ;
 store . dump ( ) ;
 + store . close ( ) ;
 }

 void deleteRecursively ( File f ) throws IOException {

Prevent Derby unit test from writing a pointless log file


<nb> public class PartitionBalance {
 STRING0 ) ;
 builder . append ( summary . getSecond ( ) ) ;
 this . naryMaxMin = summary . getFirst ( ) ;
 -
 + builder . append ( STRING1 + getUtility ( ) ) . append ( Utils . NEWLINE ) ;
 this . verbose = builder . toString ( ) ;
 }


<nb> public class MyTestInjector {
 }
 if ( host instanceof PsiCommentImpl ) {
 String text = host . getText ( ) ;
 - if ( text . startsWith ( STRING0 ) && text . endsWith ( STRING1 ) ) {
 + if ( text . startsWith ( STRING2 ) && text . endsWith ( STRING3 ) ) {
 TextRange textRange = new TextRange ( NUMBER0 , text . length ( ) - NUMBER0 ) ;
 if ( ! ( host . getParent ( ) instanceof PsiMethod ) ) return ;
 PsiMethod method = ( PsiMethod ) host . getParent ( ) ;

changed injection rule for MyTestInjector to avoid clashing between MyTestInjector and real GWT injector


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

 <nb> public class ProxyHelper {
 Object result = toObject ( response . getValue ( ) ) ;
 if ( result instanceof ClientServiceException ) {
 final ClientServiceException ex = ( ClientServiceException ) result ;
 - if ( ex . getThrowable ( ) instanceof RuntimeException ) {
 - throw ( RuntimeException ) ex . getThrowable ( ) ;
 - } else {
 - throw new RuntimeException ( ex . getThrowable ( ) ) ;
 - }
 + Util . throwUncheckedException ( ex . getThrowable ( ) ) ;
 }
 return result ;
 }


<nb> public final class NfcAdapter {
 COMMENT
 COMMENT
 COMMENT
 + COMMENT
 COMMENT
 public boolean zeroClickEnabled ( ) {
 try {


<nb> import NAMESPACE ;
 import NAMESPACE ;

 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 COMMENT
 public class LogAdapter extends LogWriter {


<nb> class NativeLibraryMergeEnhancer {
 }
 }

 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 @ value.immutable
 @ buckstyleimmutable
 abstract static class AbstractNativeLibraryMergeEnhancementResult {
 <nb> class NativeLibraryMergeEnhancer {
 public abstract ImmutableList < NativeLinkable > getMergedLinkablesAssets ( ) ;
 }

 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 private static class MergedLibNativeLinkable implements NativeLinkable {
 private final CxxBuckConfig cxxBuckConfig ;
 private final BuildRuleResolver ruleResolver ;

Move a comment in NativeLibraryMergeEnhancer


<nb> public class BuildProcessClasspathManager {
 return extraDirFile ;
 }
 }
 - return PluginPathManager . getPluginHome ( pluginDirName ) ;
 + File pluginHome = PluginPathManager . getPluginHome ( pluginDirName ) ;
 + if ( ! pluginHome . isDirectory ( ) && StringUtil . isCapitalized ( pluginDirName ) ) {
 + pluginHome = PluginPathManager . getPluginHome ( StringUtil . decapitalize ( pluginDirName ) ) ;
 + }
 + return pluginHome . isDirectory ( ) ? pluginHome : null ;
 }

 private static List < String > getDynamicClasspath ( Project project ) {

try decapitalize plugin name to find plugin dir e g for Osmorc plugin under case sensitive OS


<nb> class CertificateValidatorCache {

 if ( domain != null && domain . length ( ) != NUMBER0 ) {
 if ( secureHash != null && secureHash . length != NUMBER0 ) {
 - CacheEntry cacheEntry = ( CacheEntry ) mCacheMap . get (
 - new Integer ( mBigScrew ^ domain . hashCode ( ) ) ) ;
 + final Integer key = new Integer ( mBigScrew ^ domain . hashCode ( ) ) ;
 + CacheEntry cacheEntry = mCacheMap . get ( key ) ;
 if ( cacheEntry != null ) {
 if ( ! cacheEntry . expired ( ) ) {
 rval = cacheEntry . has ( domain , secureHash ) ;
 <nb> class CertificateValidatorCache {
 }
 SINGLE
 } else {
 - mCacheMap . remove ( cacheEntry ) ;
 + mCacheMap . remove ( key ) ;
 }
 }
 }

Using proper key for removing object from the map


<nb> public class MediaSessionCompat {
 COMMENT
 COMMENT
 COMMENT
 - public Token fromToken ( Object token ) {
 + public static Token fromToken ( Object token ) {
 if ( token == null || android . os . Build . VERSION . SDK_INT < NUMBER0 ) {
 return null ;
 }

Make the method for getting a compat Token from a Token static


<nb> public class GroovyPagesUriSupport implements GroovyPagesUriService , org . codehau
 return webRequest != null ? webRequest . getControllerName ( ) : null ;
 }
 else {
 - if ( ! controller . getClass ( ) . getSimpleName ( ) . endsWith ( ControllerArtefactHandler . TYPE ) ) {
 + String simpleName = controller . getClass ( ) . getSimpleName ( ) ;
 + if ( ! simpleName . endsWith ( ControllerArtefactHandler . TYPE ) ) {
 GrailsWebRequest webRequest = GrailsWebRequest . lookup ( ) ;
 return webRequest != null ? webRequest . getControllerName ( ) : null ;
 }
 else {
 - return GrailsNameUtils . getLogicalPropertyName ( controller . getClass ( ) . getSimpleName ( ) , ControllerArtefactHandler . TYPE ) ;
 + return GrailsNameUtils . getLogicalPropertyName ( simpleName , ControllerArtefactHandler . TYPE ) ;
 }
 }
 }


<nb> public class TwoWayView extends AdapterView < ListAdapter > implements
 if ( maybeStartScrolling ( delta ) ) {
 return true ;
 }
 +
 + break ;
 }

 case MotionEvent . ACTION_CANCEL :


<nb> public final class PokemapSharedPreferences implements PokemapAppPreferences {
 }

 private String getStoredString ( String value ) {
 - return value . split ( STRING0 ) [ NUMBER0 ] ;
 + if ( value == null ) return null ;
 + String [ ] parts = value . split ( STRING0 ) ;
 +
 + return ( parts . length > NUMBER0 ) ? parts [ NUMBER0 ] : null ;
 }

 @ override


<nb>
 -
 package NAMESPACE ;

 import NAMESPACE ;
 <nb> public class TestCustomEnumKeyDeserializer extends BaseMapTest
 }

 @ override
 - public TestEnum deserialize ( JsonParser jp , DeserializationContext ctxt ) throws IOException {
 - String code = jp . getText ( ) ;
 + public TestEnum deserialize ( JsonParser p , DeserializationContext ctxt ) throws IOException {
 + String code = p . getText ( ) ;
 try {
 return TestEnum . lookup ( code ) ;
 } catch ( IllegalArgumentException e ) {
 - throw new InvalidFormatException ( STRING0 , jp . getCurrentLocation ( ) , code , TestEnum . class ) ;
 + throw InvalidFormatException . from ( p , STRING0 ,
 + code , TestEnum . class ) ;
 }
 }
 }


<nb> public class SimpleGroovyClassDocAssembler extends VisitorAdapter implements Gro
 for ( String name : importedClassesAndPackages ) {
 if ( name . endsWith ( slashName ) ) {
 typeName = name ;
 - break ;
 + SINGLE
 }
 }
 }

wasted work in SimpleGroovyClassDocAssembler temp revert


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

 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
 }

 @ override
 + protected void checkResultByText ( String message , @ notnull String fileText , boolean ignoreTrailingSpaces , String filePath ) {
 + super . checkResultByText ( message , fileText , ignoreTrailingSpaces , new File ( filePath ) . getAbsolutePath ( ) ) ;
 + }
 +
 + @ override
 protected String getBasePath ( ) {
 return getClass ( ) . getAnnotation ( TestMetadata . class ) . value ( ) ;
 }

Fix file path which is passed to the FileComparisonException so that we can update test data using text comparison UI


<nb> public class PullToRefreshAttacher {
 . getDecorView ( ) ;

 SINGLE
 + mHeaderViewWrapper = new FrameLayout ( mActivity ) ;
 mHeaderView = LayoutInflater . from (
 mEnvironmentDelegate . getContextForInflater ( activity ) ) . inflate (
 - options . headerLayout , decorView , false ) ;
 + options . headerLayout , mHeaderViewWrapper , false ) ;
 if ( mHeaderView == null ) {
 throw new IllegalArgumentException ( STRING0 ) ;
 }
 SINGLE
 mHeaderView . setVisibility ( View . INVISIBLE ) ;
 -
 - mHeaderViewWrapper = new FrameLayout ( mActivity ) ;
 mHeaderViewWrapper . addView ( mHeaderView ) ;

 SINGLE

Fix parent that the HeaderView is inflated with


<nb> public class AnnotatedElementUtilsTests {
 @ aliasfor ( annotation = ContextConfig . class )
 String [ ] locations ( ) default { } ;

 - SINGLE
 + SINGLE
 SINGLE
 @ aliasfor ( annotation = ContextConfig . class , attribute = STRING0 )
 String [ ] value ( ) default { } ;