Revert "AndroidX"

This reverts commit c126ca0392.

app/build.gradle

@@ -184,7 +184,7 @@ dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 

app/src/main/java/com/yizhuan/erban/audio/helper/SvgaCacheManager.java

@@ -6,13 +6,11 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
 
-import androidx.annotation.NonNull;
-
 import com.opensource.svgaplayer.SVGADrawable;
 import com.opensource.svgaplayer.SVGAParser;
 import com.opensource.svgaplayer.SVGAVideoEntity;
 
-
+import org.jetbrains.annotations.NotNull;
 
 import io.reactivex.Single;
 import io.reactivex.SingleOnSubscribe;
@@ -101,7 +99,7 @@ public class SvgaCacheManager {
             String path = isBottle ? "svga/svga_voice_bottle.svga" : "svga/svga_voice_bubble.svga";
             parser.decodeFromAssets(path, new SVGAParser.ParseCompletion() {
                 @Override
-                public void onComplete(@NonNull SVGAVideoEntity svgaVideoEntity) {
+                public void onComplete(@NotNull SVGAVideoEntity svgaVideoEntity) {
                     if (isBig) {
                         if (isBottle) {
                             bigBottleSvga = new SVGADrawable(svgaVideoEntity);

app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java

@@ -47,7 +47,7 @@ public class RoomImposeDialog extends BottomSheetDialog implements View.OnClickL
         binding = DataBindingUtil.bind(findViewById(R.id.dialog_container));
         binding.setClick(this);
 
-        FrameLayout bottomSheet = findViewById(R.id.design_bottom_sheet);
+        FrameLayout bottomSheet = findViewById(android.support.design.R.id.design_bottom_sheet);
         if (bottomSheet != null) {
             BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
             BottomSheetBehavior.from(bottomSheet).setPeekHeight(

app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java

@@ -3,8 +3,6 @@ package com.yizhuan.erban.avroom.fragment;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
-
-import androidx.annotation.NonNull;
 import androidx.lifecycle.ViewModelProviders;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -190,7 +188,7 @@ import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -3101,7 +3099,7 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
     }
 
     @Override
-    public void notInWorld(@NonNull MiniWorldInWorldInfo miniWorldInWorldInfo) {
+    public void notInWorld(@NotNull MiniWorldInWorldInfo miniWorldInWorldInfo) {
         messageView.postDelayed(new Runnable() {
             @Override
             public void run() {

app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyView.java

@@ -1,7 +1,5 @@
 package com.yizhuan.erban.avroom.view;
 
-import androidx.annotation.NonNull;
-
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
 import com.yizhuan.erban.avroom.widget.ViewItem;
 import com.yizhuan.xchat_android_core.bean.RoomMicInfo;
@@ -9,6 +7,8 @@ import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo;
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
 import com.yizhuan.xchat_android_library.base.IMvpBaseView;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.List;
 
 /**
@@ -89,7 +89,7 @@ public interface IHomePartyView extends IMvpBaseView {
      *
      * @param miniWorldInWorldInfo
      */
-    void notInWorld(@NonNull MiniWorldInWorldInfo miniWorldInWorldInfo);
+    void notInWorld(@NotNull MiniWorldInWorldInfo miniWorldInWorldInfo);
 
     /**
      * 关注成功

app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java

@@ -19,8 +19,6 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-
 import com.netease.nim.uikit.common.util.string.StringUtil;
 import com.opensource.svgaplayer.SVGACallback;
 import com.opensource.svgaplayer.SVGADrawable;
@@ -39,7 +37,7 @@ import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver;
 import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
 import com.yizhuan.xchat_android_library.utils.ResolutionUtils;
 
-
+import org.jetbrains.annotations.NotNull;
 
 import java.lang.ref.WeakReference;
 import java.net.MalformedURLException;
@@ -191,7 +189,7 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback {
         SVGAParser parser = new SVGAParser(getContext());
         parser.parse(new URL(url), new SVGAParser.ParseCompletion() {
             @Override
-            public void onComplete(@NonNull SVGAVideoEntity videoItem) {
+            public void onComplete(@NotNull SVGAVideoEntity videoItem) {
                 SVGADrawable drawable = new SVGADrawable(videoItem);
                 svgaImageView.setImageDrawable(drawable);
                 svgaImageView.startAnimation();

app/src/main/java/com/yizhuan/erban/avroom/widget/GiftView.java

@@ -9,8 +9,6 @@ import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.RelativeLayout;
 
-import androidx.annotation.NonNull;
-
 import com.netease.nim.uikit.common.util.string.StringUtil;
 import com.opensource.svgaplayer.SVGACallback;
 import com.opensource.svgaplayer.SVGADrawable;
@@ -25,7 +23,7 @@ import com.yizhuan.erban.ui.gift.widget.GiftDataInfo;
 import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
 import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo;
 
-
+import org.jetbrains.annotations.NotNull;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -151,7 +149,7 @@ public class GiftView extends RelativeLayout implements SVGACallback {
         SVGAParser parser = new SVGAParser(getContext());
         parser.parse(new URL(url), new SVGAParser.ParseCompletion() {
             @Override
-            public void onComplete(@NonNull SVGAVideoEntity videoItem) {
+            public void onComplete(@NotNull SVGAVideoEntity videoItem) {
                 SVGADrawable drawable = new SVGADrawable(videoItem);
                 svgaImageView.setImageDrawable(drawable);
                 svgaImageView.startAnimation();

app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java

@@ -33,7 +33,7 @@ public abstract class BaseBsDialog extends BottomSheetDialog {
         setContentView(getDialogLayout());
         ButterKnife.bind(this);
         setCanceledOnTouchOutside(isCanceledOnTouchOutside());
-        FrameLayout bottomSheet = (FrameLayout) findViewById(R.id.design_bottom_sheet);
+        FrameLayout bottomSheet = (FrameLayout) findViewById(android.support.design.R.id.design_bottom_sheet);
         if (bottomSheet != null) {
             BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
         }

app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java

@@ -4,8 +4,6 @@ import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,6 +14,9 @@ import com.yizhuan.xchat_android_library.utils.NetworkUtils;
 import com.yizhuan.xchat_android_library.utils.log.MLog;
 import com.yizhuan.erban.R;
 
+import org.jetbrains.annotations.NotNull;
+
+
 /**
  * Created by xujiexing on 14-4-9.
  */
@@ -46,7 +47,7 @@ public class ReloadFragment extends AbsStatusFragment {
     }
 
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NotNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_reload, container, false);
 
         if (savedInstanceState != null) {

app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java

@@ -106,7 +106,7 @@ public class CommonPopupDialog extends BottomSheetDialog implements OnClickListe
             mCancelBtn.setVisibility(View.VISIBLE);
             mCancelBtn.setText(bottomButton.mText);
         }
-        FrameLayout bottomSheet = findViewById(R.id.design_bottom_sheet);
+        FrameLayout bottomSheet = findViewById(android.support.design.R.id.design_bottom_sheet);
         if (bottomSheet != null) {
             BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
             BottomSheetBehavior.from(bottomSheet).setPeekHeight(

app/src/main/java/com/yizhuan/erban/decoration/adapter/CarShopAdapter.java

@@ -35,7 +35,7 @@ public class CarShopAdapter extends BaseAdapter<CarInfo> {
         ItemCarShopBinding binding = (ItemCarShopBinding) helper.getBinding();
         boolean isSelect = selectPosition == helper.getAdapterPosition();
         binding.llCarHolder.setSelected(isSelect);
-//        binding.setSelectPosition(isSelect);
+        binding.setSelectPosition(isSelect);
 
         if (item.getLabelType() == CarInfo.TAG_TYPE_NORMAL) {
             binding.ivTag.setVisibility(View.GONE);

app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java

@@ -37,7 +37,7 @@ public class HeadWearShopAdapter extends BaseAdapter<HeadWearInfo> {
         ItemHeadWearBinding binding = (ItemHeadWearBinding) helper.getBinding();
         binding.llRoot.setSelected(selectPosition == helper.getAdapterPosition());
         NobleUtil.loadHeadWears(item.getPic(), binding.ivHeadWear);
-//        binding.setSelectPosition(selectPosition == helper.getAdapterPosition());
+        binding.setSelectPosition(selectPosition == helper.getAdapterPosition());
 
         if (item.getLabelType() == HeadWearInfo.LABEL_TYPE_NORMAL) {
             binding.ivTag.setVisibility(View.GONE);

app/src/main/java/com/yizhuan/erban/home/adapter/HomeFragmentAdapter.java

@@ -71,7 +71,7 @@ import com.yizhuan.xchat_android_core.user.bean.UserInfo;
 import com.yizhuan.xchat_android_library.utils.ListUtils;
 import com.yizhuan.xchat_android_library.utils.StringUtils;
 
-
+import org.jetbrains.annotations.NotNull;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -537,7 +537,7 @@ public class HomeFragmentAdapter extends BaseMultiItemQuickAdapter<HomeItem, Bas
             try {
                 svgaParser.decodeFromURL(new URL(badge), new SVGAParser.ParseCompletion() {
                     @Override
-                    public void onComplete(@NonNull SVGAVideoEntity svgaVideoEntity) {
+                    public void onComplete(@NotNull SVGAVideoEntity svgaVideoEntity) {
                         SVGADrawable drawable = new SVGADrawable(svgaVideoEntity);
                         ivTabLabel.setImageDrawable(drawable);
                         ivTabLabel.startAnimation();

app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java

@@ -111,6 +111,7 @@ import com.yizhuan.xchat_android_library.utils.ListUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.jetbrains.annotations.NotNull;
 
 import java.security.MessageDigest;
 import java.util.ArrayList;
@@ -236,7 +237,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
     @Override
     public void onSetListener() {
         mBinding.setClick(this);
-//        mBinding.setOpenVisible(true);
+        mBinding.setOpenVisible(true);
     }
 
     @Override
@@ -752,7 +753,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
     /**
      * 转换成带箭头的文本
      */
-    @NonNull
+    @NotNull
     private SpannableString getArrowSpannableString(boolean isUp, String text) {
         if (!text.endsWith("[arrow]")) {
             text = text + " [arrow]";
@@ -933,7 +934,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
         startLocation();
 
         // 超管不展示开房按钮
-//        mBinding.setOpenVisible(!(userInfo != null && userInfo.getPlatformRole() == 1));
+        mBinding.setOpenVisible(!(userInfo != null && userInfo.getPlatformRole() == 1));
     }
 
     public List<View> getHomeBanner(int num) {

app/src/main/java/com/yizhuan/erban/push/HwPushMessageReceiver.java

@@ -3,15 +3,15 @@ package com.yizhuan.erban.push;
 import android.content.Context;
 import android.os.Bundle;
 
-import com.netease.nimlib.sdk.mixpush.HWPushMessageService;
+import com.netease.nimlib.sdk.mixpush.HWPushMessageReceiver;
 import com.orhanobut.logger.Logger;
 import com.yizhuan.xchat_android_core.statistic.StatisticManager;
 
-public class HwPushMessageReceiver extends HWPushMessageService {
+public class HwPushMessageReceiver extends HWPushMessageReceiver {
 
     @Override
-    public void onNewToken(String token) {
+    public void onToken(Context context, String token, Bundle extras) {
-        super.onNewToken(token);
+        super.onToken(context, token, extras);
         StatisticManager.Instance().logToLocalFile("华为推送token:" + token);
     }
 }

app/src/main/java/com/yizhuan/erban/ui/gift/util/Preconditions.java

@@ -24,7 +24,7 @@ public final class Preconditions {
     }
   }
 
-  public static <T> T checkNonNull(T value, String message) {
+  public static <T> T checkNotNull(T value, String message) {
     if (value == null) {
       throw new NullPointerException(message);
     }

app/src/main/java/com/yizhuan/erban/ui/gift/widget/GlideCircleTransform.java

@@ -18,7 +18,7 @@ import java.security.MessageDigest;
  */
 public class GlideCircleTransform extends BitmapTransformation {
     public GlideCircleTransform(Context context) {
-        super();
+        super(context);
     }
 
     @Override

app/src/main/java/com/yizhuan/erban/ui/widget/CustSlidingTabLayout.java

@@ -164,7 +164,7 @@ public class CustSlidingTabLayout extends HorizontalScrollView implements ViewPa
         mDividerPadding = ta.getDimension(R.styleable.CustSlidingTabLayout_tl_divider_padding, dp2px(12));
 
         mTextsize = ta.getDimension(R.styleable.CustSlidingTabLayout_tl_textsize, sp2px(14));
-//        mTextSizeNormal = ta.getDimension(R.styleable.CustSlidingTabLayout_tl_textsize_normal, mTextsize);
+        mTextSizeNormal = ta.getDimension(R.styleable.CustSlidingTabLayout_tl_textsize_normal, mTextsize);
 
         mTextSelectColor = ta.getColor(R.styleable.CustSlidingTabLayout_tl_textSelectColor, Color.parseColor("#ffffff"));
         mTextUnselectColor = ta.getColor(R.styleable.CustSlidingTabLayout_tl_textUnselectColor, Color.parseColor("#AAffffff"));

app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java

@@ -284,7 +284,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
         setContentView(R.layout.dialog_bottom_gift);
         compositeDisposable = new CompositeDisposable();
         init(findViewById(R.id.ll_dialog_bottom_gift));
-        FrameLayout bottomSheet = findViewById(R.id.design_bottom_sheet);
+        FrameLayout bottomSheet = findViewById(android.support.design.R.id.design_bottom_sheet);
         if (bottomSheet != null) {
             BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
             BottomSheetBehavior.from(bottomSheet).setHideable(false);

app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java

@@ -78,7 +78,7 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
         tvQqZone.setOnClickListener(this);
         tvCancel.setOnClickListener(this);
         findViewById(R.id.tv_qq_game).setOnClickListener(this);
-        FrameLayout bottomSheet = (FrameLayout) findViewById(R.id.design_bottom_sheet);
+        FrameLayout bottomSheet = (FrameLayout) findViewById(android.support.design.R.id.design_bottom_sheet);
         if (bottomSheet != null) {
             BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
         }

app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java

@@ -67,7 +67,7 @@ public class DynamicFaceDialog extends BottomSheetDialog
         setContentView(R.layout.dialog_bottom_face);
         EventBus.getDefault().register(this);
         init(findViewById(R.id.rl_dynamic_face_dialog_root));
-        FrameLayout bottomSheet = (FrameLayout) findViewById(R.id.design_bottom_sheet);
+        FrameLayout bottomSheet = (FrameLayout) findViewById(android.support.design.R.id.design_bottom_sheet);
         if (bottomSheet != null) {
             BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
             BottomSheetBehavior.from(bottomSheet).setPeekHeight(

app/src/main/res/layout/item_head_wear.xml

@@ -10,7 +10,7 @@
             name="headWearInfo"
             type="com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo" />
         <variable
-            name="clickPosition"
+            name="select_position"
             type="Boolean" />
     </data>
 

app/src/main/res/values/attrs.xml

@@ -254,7 +254,7 @@
         <attr name="tl_textUnselectColor"/>
         <attr name="tl_textBold"/>
         <attr name="tl_textAllCaps"/>
-<!--        <attr name="tl_textsize_normal"/>-->
+        <attr name="tl_textsize_normal"/>
     </declare-styleable>
     <declare-styleable name="LimitEditText">
         <attr name="let_app_cursor" format="boolean" />

app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java

@@ -53,7 +53,7 @@ public class VoiceSeekDialog extends BottomSheetDialog implements SeekBar.OnSeek
         musicVoiceNum.setText(PlayerModel.get().getCurrentVolume()+"%");
         voiceNum.setText(PlayerModel.get().getCurrentRecordingVolume()+"%");
 
-        FrameLayout bottomSheet = findViewById(R.id.design_bottom_sheet);
+        FrameLayout bottomSheet = findViewById(android.support.design.R.id.design_bottom_sheet);
         if (bottomSheet != null) {
             BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
             BottomSheetBehavior.from(bottomSheet).setPeekHeight(

app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java

@@ -12,8 +12,6 @@ import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-
 import com.opensource.svgaplayer.SVGADrawable;
 import com.opensource.svgaplayer.SVGAImageView;
 import com.opensource.svgaplayer.SVGAParser;
@@ -28,7 +26,7 @@ import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
 import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo;
 import com.yizhuan.xchat_android_core.utils.ActivityUtil;
 
-
+import org.jetbrains.annotations.NotNull;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -108,7 +106,7 @@ public class PublicChatHallGiftAnimationDialog extends BaseSdDialog {
         try {
             svgaParser.parse(new URL("https://img.erbanyy.com/public_chat_spring.svga"), new SVGAParser.ParseCompletion() {
                 @Override
-                public void onComplete(@NonNull SVGAVideoEntity svgaVideoEntity) {
+                public void onComplete(@NotNull SVGAVideoEntity svgaVideoEntity) {
                     SVGADrawable drawable = new SVGADrawable(svgaVideoEntity);
                     svgaImageView.setImageDrawable(drawable);
                     svgaImageView.startAnimation();

core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java

@@ -11,7 +11,7 @@ import com.yizhuan.xchat_android_core.music.db.dao.LocalMusicDao;
 import com.yizhuan.xchat_android_core.music.db.dao.SongDao;
 import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
 
-@Database(entities = {LocalMusicBean.class, SongBean.class}, version = 1, exportSchema = false)
+@Database(entities = {LocalMusicBean.class, SongBean.class}, version = 1, exportSchema = true)
 public abstract class AppDataBase extends RoomDatabase {
 
     private static volatile AppDataBase mInstance;

gradle.properties

@@ -9,23 +9,25 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m
 org.gradle.daemon=true
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
 android.enableD8=true
-org.gradle.parallel=true
 android.injected.testOnly=false
-org.gradle.configureondemand=true
-android.enableBuildScriptClasspathCheck=false
 # CI jenkins 参数化构建传入参数
+
 version_name=1.0.0
 version_code=1
+
 # jenkins打包参数 可选值 arm x86 arm_x86
 ndk_abi_filters=arm
 # jenkins参数，debug下打渠道包用到，
 # 可选值 v1：仅支持v1签名，v1v2：支持v1v2签名
 sign_mode=v1
-with_jenkins=false
 android.useAndroidX=true
 android.enableJetifier=true
-org.gradle.caching=true
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Thu Apr 09 00:51:19 CST 2020
+#Thu Aug 09 10:54:29 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

library/src/main/java/com/yizhuan/xchat_android_library/utils/Validate.java

@@ -36,7 +36,7 @@ import java.util.regex.Pattern;
  * <p/>
  * <pre>
  * Validate.isTrue(i &gt; 0, "The value must be greater than zero: %d", i);
- * Validate.NonNull(surname, "The surname must not be %s", null);
+ * Validate.notNull(surname, "The surname must not be %s", null);
  * </pre>
  * <p/>
  * <p>#ThreadSafe#</p>
@@ -182,7 +182,7 @@ public class Validate {
         }
     }
 
-    // NonNull
+    // notNull
     //---------------------------------------------------------------------------------
 
     /**